modelish 1.0.0.pre.1 → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebd460629d89807f4466c496083fd9a0a7be54d5
-  data.tar.gz: 667ce55093567f11e2d0c4a5f108828d5c3808fa
+  metadata.gz: dc853b39e8007eefe46f071df1f509ec3bd82ba7
+  data.tar.gz: 75abb4222fda87e473b7532b8ec3ae6f65e19a39
 SHA512:
-  metadata.gz: 7414d42602a180112990808d9ce895ad9da82ba6dc19dc9dc69d6967286b986260ae8d9ba8bfaa4c5842d508fc12fdfb902c56567e72ae4f8a1019afc81e137d
-  data.tar.gz: ac6d7d3831e1854da332e0d6b14e0b2358f17e0a6e4baa0d1b326e995c5afc51ab76e7c257a38389673bb554692ee0600b32cd1610b9abcd48a0ea1dacd9090f
+  metadata.gz: e603be6452f75d8b29b2857748e57b6b75d56fbc5b081657a194a90f9cbc32c1bad233ce81aea9188eecfccd9d90200706a3d80c0c8797bad4ed69a3ea7766f8
+  data.tar.gz: 31112fc64f9002444293ca183c1f453b35ceb94fe12f875cef77001958c2cf4b2fa00aaf86496fb55244b5dc1bcfa40f0351d65bd17f9957293d3b41f228e90b

data/.travis.yml

@@ -8,7 +8,17 @@ gemfile:
   - gemfiles/hashie_1.gemfile
   - gemfiles/hashie_2.gemfile
   - gemfiles/hashie_3.gemfile
+dist: trusty
+sudo: false
+cache:
+  bundler: true
 before_install:
   - gem install bundler
 script:
-  - bundle exec rspec spec
+  - bundle exec rspec
+after_script:
+  - bundle exec codeclimate-test-reporter
+addons:
+  code_climate:
+    repo_token:
+      secure: "YXAGhdc20mDicXunFasltPCTg3ekBPdyBdsUYml2iRiCdGx4ZjqEORPlg6AixgGnP0D2JHsYMaAPlAKYx3bOULv3lUH1JORTNa76hhaOOzLFAdIMcU2qbLi+8oHudZucojKqC4ppVMTJBS2P1WH+FUfxXCs7HNkUBlqCmmQdZ/g="

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.0.pre.2 (2017-06-13)
+
+* Bug fix for initialization with string attribute keys
+
 ## 1.0.0.pre.1 (2017-06-11)
 
 * **Backwards incompatible change**: dropped support for ruby 1.8.7

data/lib/modelish/base.rb

@@ -43,13 +43,13 @@ module Modelish
     def init_attributes(attributes)
       attributes.delete_if do |k, v|
         if self.class.translations.keys.include?(k.to_sym)
-          self[k] = v
+          self[k.to_sym] = v
           true
         end
       end
 
       attributes.each_pair do |att, value|
-        self[att] = value
+        self[att.to_sym] = value
       end
     end
 

data/lib/modelish/property_types.rb

@@ -45,95 +45,145 @@ module Modelish
         accessor = property_name.to_sym
         return if property_types[accessor] == property_type
 
-        # TODO: Refactor. This method is getting unwieldy as more
-        # corner cases are discovered. A few well-placed design
-        # refinements should take care of it (now we just need to figure
-        # out what those are.)
         property_types[accessor] = property_type
 
-        raw_accessor = define_raw_accessor(accessor)
-        bang_accessor = define_bang_accessor(accessor)
+        # Protected attributes used during type conversion
+        define_raw_attribute(accessor)
+        define_bang_attribute(accessor)
+        define_typed_attribute(accessor)
+        define_safe_attribute(accessor)
 
-        typed_accessor = "_typed_#{accessor}".to_sym
+        define_public_attribute(accessor)
+      end
+
+      def property_types
+        @property_types ||= {}
+      end
+
+      private
+
+      def typed_accessor(name)
+        "_typed_#{name}".to_sym
+      end
+
+      def define_typed_attribute(name)
+        typed_accessor = typed_accessor(name)
         typed_mutator = "#{typed_accessor}=".to_sym
-        to_safe = "_to_safe_#{accessor}".to_sym
 
         class_eval do
           remove_method(typed_accessor) if method_defined?(typed_accessor)
           remove_method(typed_mutator) if method_defined?(typed_mutator)
+
           attr_accessor typed_accessor
           protected typed_accessor, typed_mutator
+        end
+      end
 
-          remove_method(to_safe) if method_defined?(to_safe)
-          define_method(to_safe) do
-            begin
-              send(bang_accessor)
-            rescue
-              send(raw_accessor)
-            end
-          end
-          protected to_safe
+      def safe_accessor(name)
+        "_to_safe_#{name}".to_sym
+      end
 
-          remove_method(accessor) if method_defined?(accessor)
-          define_method(accessor) do
-            val = send(typed_accessor)
+      def define_safe_attribute(name)
+        safe_accessor = safe_accessor(name)
+        bang_accessor = bang_accessor(name)
+        raw_accessor = raw_accessor(name)
 
-            unless val || send(raw_accessor).nil?
-              val = send(to_safe)
-              send(typed_mutator, val)
-            end
+        class_eval do
+          remove_method(safe_accessor) if method_defined?(safe_accessor)
+          define_method(safe_accessor) do
+            # Yes, we really do want to use inline rescue here, as this
+            # method should always try to return *something*
+            send(bang_accessor) rescue send(raw_accessor)
+          end
+          protected safe_accessor
+        end
+      end
 
-            val
+      def define_public_reader(name)
+        typed_accessor = typed_accessor(name)
+        safe_accessor = safe_accessor(name)
+
+        class_eval do
+          remove_method(name) if method_defined?(name)
+          define_method(name) do
+            send(typed_accessor) ||
+              send("#{typed_accessor}=", send(safe_accessor))
           end
+        end
+      end
+
+      def define_public_writer(name)
+        typed_accessor = typed_accessor(name)
+        safe_accessor = safe_accessor(name)
+        raw_accessor = raw_accessor(name)
 
-          remove_method("#{accessor}=") if method_defined?("#{accessor}=")
-          define_method("#{accessor}=") do |val|
+        class_eval do
+          remove_method("#{name}=") if method_defined?("#{name}=")
+          define_method("#{name}=") do |val|
             send("#{raw_accessor}=", val)
-            send(typed_mutator, send(to_safe))
+            send("#{typed_accessor}=", send(safe_accessor))
           end
         end
       end
 
-      def property_types
-        @property_types ||= {}
+      def define_public_attribute(name)
+        define_public_reader(name)
+        define_public_writer(name)
       end
 
-      private
+      def raw_accessor(name)
+        "raw_#{name}".to_sym
+      end
 
-      def define_raw_accessor(name)
-        accessor = name.to_sym
-        raw_accessor = "raw_#{name}".to_sym
+      def define_raw_attribute_reader(name)
+        raw_accessor = raw_accessor(name)
 
-        mutator = "#{name}=".to_sym
-        raw_mutator = "raw_#{name}=".to_sym
+        class_eval do
+          unless method_defined?(raw_accessor)
+            if method_defined?(name)
+              alias_method(raw_accessor, name)
+            else
+              attr_reader raw_accessor
+            end
+          end
+        end
+      end
+
+      def define_raw_attribute_writer(name)
+        raw_accessor = raw_accessor(name)
 
         class_eval do
-          unless method_defined?(raw_accessor) && method_defined?(raw_mutator)
-            if method_defined?(accessor) && method_defined?(mutator)
-              alias_method(raw_accessor, accessor)
-              alias_method(raw_mutator, mutator)
+          unless method_defined?("#{raw_accessor}=")
+            if method_defined?("#{name}=")
+              alias_method("#{raw_accessor}=", "#{name}=")
             else
-              attr_accessor raw_accessor
+              attr_writer raw_accessor
             end
           end
         end
+      end
 
-        raw_accessor
+      def define_raw_attribute(name)
+        define_raw_attribute_reader(name)
+        define_raw_attribute_writer(name)
       end
 
-      def define_bang_accessor(property_name)
-        bang_accessor = "#{property_name}!".to_sym
-        converter = value_converter(property_types[property_name.to_sym])
+      def bang_accessor(name)
+        "#{name}!".to_sym
+      end
+
+      def define_bang_attribute(name)
+        bang_accessor = bang_accessor(name)
+        raw_accessor = raw_accessor(name)
+        converter = value_converter(property_types[name])
 
         class_eval do
           remove_method(bang_accessor) if method_defined?(bang_accessor)
           define_method(bang_accessor) do
-            value = send("raw_#{property_name}")
+            value = send(raw_accessor)
             converter && value ? converter.call(value) : value
           end
         end
-
-        bang_accessor
       end
 
       def value_converter(property_type)

data/lib/modelish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modelish
-  VERSION = '1.0.0-1'
+  VERSION = '1.0.0.pre.2'
 end

data/modelish.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('hashie', '>= 1.0.0')
 
   s.add_development_dependency('appraisal')
+  s.add_development_dependency('codeclimate-test-reporter')
   s.add_development_dependency('fuubar')
   s.add_development_dependency('rspec', '~> 3.6')
   s.add_development_dependency('rspec-its')

data/spec/support/property_examples.rb

@@ -10,18 +10,36 @@ RSpec.shared_examples_for 'a modelish property' do
 
   let(:init_options) { { property_name => property_value } }
 
-  it { is_expected.to respond_to(property_name) }
+  context 'when initialized with symbol key' do
+    let(:init_options) { { property_name.to_sym => property_value } }
+
+    it { is_expected.to respond_to(property_name) }
+  end
+
+  context 'when initialized with a string key' do
+    let(:init_options) { { property_name.to_s => property_value } }
+
+    it { is_expected.to respond_to(property_name) }
+  end
 
   describe 'getter' do
     subject { model.send(property_name) }
 
     context 'without init options' do
-      let(:init_options) { nil }
+      let(:init_options) {}
 
       it { is_expected.to eq(default_value) }
     end
 
-    context 'with init options' do
+    context 'with symbol init options' do
+      let(:init_options) { { property_name.to_sym => property_value } }
+
+      it { is_expected.to eq(property_value) }
+    end
+
+    context 'with string init options' do
+      let(:init_options) { { property_name.to_s => property_value } }
+
       it { is_expected.to eq(property_value) }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modelish
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement