static_models 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36852f849aa037a3e75ddd732e77a2f9eef48b74
-  data.tar.gz: d064389a9fe474c8237f3809ca08403784fb3f95
+  metadata.gz: 14b52ac6a5f6d2ea3a9cd809e96dc9a5d3a9bd84
+  data.tar.gz: 0fe26ca5989a19dbdf39805a156e4dd4a16509dc
 SHA512:
-  metadata.gz: 9f92c0dcdcba6cd964a29e6bbf98de5cf7f196f9309e882a79871ff5aff2031af662302daba15629d66a35c727a3335cc94b33309a6b7c6771eb6b1fd3869b19
-  data.tar.gz: e384551d6fee147c63c2602627ad47027a07f31e99587a078f947c78ed4d5b80ea5a10dfc1a92e5d1731c997e911791b05f8a9eb6f4154048ece1126045a7e7c
+  metadata.gz: 8d2a70e05c48350c0a4c48b3924403a511358dab5f09c9fd9bd71a2cfe84835c938b09324ac06cdf4610c11878e4218cb49848bb29311220f3bd8148d982ec27
+  data.tar.gz: 0559dd452091ec6fd0954d10eb81d70a1450a2ce9e2efd4baf0f8b78890dacb90ad6e536ada21cadbcce89db90b6f1c4b5f7aded2ac559e71572158f8141607b

data/lib/static_models/version.rb

@@ -1,3 +1,3 @@
 module StaticModels
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/static_models.rb

@@ -69,14 +69,16 @@ module StaticModels
       def belongs_to(association, opts = {})
         super(association, opts) if defined?(super)
 
-        define_method("#{association}") do
-          klass_name = if opts[:polymorphic]
-            send("#{association}_type")
-          else
-            (opts[:class_name] || association.to_s.camelize)
-          end
+        expected_class = unless opts[:polymorphic]
+          module_name = self.class.to_s.split("::")[0..-2].join("::")
+          [ opts[:class_name],
+            "#{module_name}::#{association.to_s.camelize}",
+            association.to_s.camelize,
+          ].compact.collect(&:safe_constantize).compact.first
+        end
 
-          klass = klass_name && klass_name.safe_constantize
+        define_method("#{association}") do
+          klass = expected_class || send("#{association}_type").to_s.safe_constantize
 
           if klass && klass.include?(Model)
             klass.find(send("#{association}_id"))
@@ -86,12 +88,8 @@ module StaticModels
         end
 
         define_method("#{association}=") do |value|
-          unless opts[:polymorphic] || value.nil?
-            expected = [opts[:class_name], association.to_s.camelize].compact
-            got = value.class.name
-            unless expected.include?(got)
-              raise TypeError.new("Expected #{expected.first} got #{got}")
-            end
+          if expected_class && !value.nil? && value.class != expected_class
+            raise TypeError.new("Expected #{expected_class} got #{value.class}")
           end
 
           if value.nil? || value.class.include?(Model)

data/static_models.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "activerecord", '~> 4.2', '>= 4.2.0'
   spec.add_development_dependency "sqlite3", "~> 1.0", ">= 1.0.0"
+  spec.add_development_dependency "byebug", "~> 1.0", ">= 1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static_models
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - nubis
@@ -112,6 +112,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: "\n    Replace your key/value classes with this.\n    Define classes
   with several 'singleton' instances.\n  "
 email: