Permalink
Browse files

Moved models into ./models/ directory

Removed temp.rb
  • Loading branch information...
1 parent 7fa2554 commit 14b4912bd755e8a242d1535847541b44503229cb @celeduc celeduc committed Jan 4, 2012
File renamed without changes.
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/simple_record")
class MyBaseModel < SimpleRecord::Base
@@ -7,4 +7,4 @@ class MyBaseModel < SimpleRecord::Base
has_virtuals :v1
-end
+end
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/simple_record")
require_relative 'my_model'
class MyChildModel < SimpleRecord::Base
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/simple_record")
require_relative 'my_base_model'
require_relative 'my_sharded_model'
require 'active_model'
@@ -1,6 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/simple_record")
class MyShardedModel < SimpleRecord::Base
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/simple_record")
require_relative 'my_base_model'
require_relative 'my_sharded_model'
View
@@ -1,9 +0,0 @@
-require_relative 'my_model'
-
-
-begin
- raise StandardError
-rescue => ex
- p ex
- puts ex.message
-end
View
@@ -4,8 +4,8 @@
require File.join(File.dirname(__FILE__), "./test_helpers")
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
#require 'active_support'
class TestBase < Test::Unit::TestCase
View
@@ -2,8 +2,8 @@
require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
require "yaml"
require 'aws'
-require 'my_model'
-require 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
require 'active_support'
require 'test_base'
@@ -76,4 +76,4 @@ def test_storing_int_as_string
# assert !@person.i_as_s_changed?
end
-end
+end
@@ -2,7 +2,7 @@
require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
require "yaml"
require 'aws'
-require 'my_simple_model'
+require_relative 'models/my_simple_model'
require 'active_support'
require 'test_base'
@@ -2,8 +2,8 @@
require_relative "../lib/simple_record"
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
require 'active_support/core_ext'
require_relative 'test_base'
View
@@ -4,9 +4,9 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
require 'active_support/core_ext'
# Tests for SimpleRecord
View
@@ -4,9 +4,9 @@
require_relative "test_base"
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
# Tests for SimpleRecord
#
@@ -2,8 +2,8 @@
require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
require "yaml"
require 'aws'
-require 'my_model'
-require 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
require 'active_support'
require 'test_base'
@@ -4,9 +4,9 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require 'my_model'
-require 'my_child_model'
-require 'model_with_enc'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
require 'active_support'
View
@@ -5,9 +5,9 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
# To test things related to rails 3 like ActiveModel usage.
class TestRails3 < TestBase
@@ -21,4 +21,4 @@ def test_active_model_defined
end
-end
+end
@@ -6,8 +6,8 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require 'my_model'
-require 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
require 'active_support'
# Tests for SimpleRecord
@@ -54,4 +54,4 @@ def test_limit
end
-end
+end
View
@@ -4,7 +4,7 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require_relative 'my_sharded_model'
+require_relative 'models/my_sharded_model'
# Tests for SimpleRecord
#
@@ -5,10 +5,10 @@
require_relative "test_base"
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
-require_relative 'my_simple_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
+require_relative 'models/my_simple_model'
# Tests for SimpleRecord
#
@@ -491,7 +491,7 @@ def test_dates
end
def test_attr_encrypted
- require_relative 'model_with_enc'
+ require_relative 'models/model_with_enc'
ssn = "123456789"
password = "my_password"
View
@@ -5,10 +5,10 @@
require_relative "test_base"
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
-require_relative 'my_simple_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
+require_relative 'models/my_simple_model'
# Tests for SimpleRecord
#
View
@@ -6,8 +6,8 @@
require File.join(File.dirname(__FILE__), "./test_base")
require "yaml"
require 'aws'
-require 'my_model'
-require 'my_child_model'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
require 'active_support'
# Tests for SimpleRecord
@@ -5,9 +5,9 @@
require_relative "test_base"
require "yaml"
require 'aws'
-require_relative 'my_model'
-require_relative 'my_child_model'
-require_relative 'model_with_enc'
+require_relative 'models/my_model'
+require_relative 'models/my_child_model'
+require_relative 'models/model_with_enc'
require_relative 'models/validated_model'
# Tests for SimpleRecord

0 comments on commit 14b4912

Please sign in to comment.