structural 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d2e683ae4dc0a1839b52352576db3fc726201321
+  data.tar.gz: 947df1932b578c7c5e786b2e6baf4463f2d10312
+SHA512:
+  metadata.gz: c4da802d16a95c7d4b5516697fb9c6c76687032686e693830c6c3f8b44a3aa47c3f9adb3ca9341ccf378afafb0e75b118ac186ed612d9ab7fa274efefffcd4a7
+  data.tar.gz: a1f58451da825b7bc071958150407011f743d2ab4411692095b6197a0a3377a749ca6de810170b1098dfa525457e00ff83e398ece251d3d2d7b1088e9dbc5e26

data/lib/structural/hashifier.rb

@@ -1,27 +1,18 @@
 module Structural
   class Hashifier
     def self.hashify(data)
-      new(data).hashify
+      {}.tap do |hash|
+        data.each do |key, value|
+          hash[key.to_sym] = as_data(value)
+        end
+      end
     end
 
-    def initialize(data)
-      @data = data
-    end
-
-    def hashify
-      Hash[data.map { |k, v| [ k.to_s, as_data(v) ] }]
-    end
-
-    private
-
-    def as_data(v)
+    def self.as_data(v)
       case v
       when Structural::Model then v.data
       when Array then v.first.is_a?(Structural::Model) ? v.map(&:data) : v
-      when Hash then Hashifier.hashify(v)
       else v end
     end
-
-    attr_reader :data
   end
 end

data/lib/structural/model.rb

@@ -11,7 +11,7 @@ module Structural
     end
 
     def unset(*keys)
-      self.class.new(data.except(*keys.map(&:to_s)))
+      self.class.new(data.except(*keys.map(&:to_sym)))
     end
 
     def eql? other
@@ -29,8 +29,8 @@ module Structural
       base.extend(Descriptor)
     end
 
-    def memoize(f, &b)
-      instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call(data))
+    def memoize(ivar, &b)
+      instance_variable_get(ivar) || instance_variable_set(ivar, b.call(data))
     end
   end
 end

data/lib/structural/model/definer.rb

@@ -1,17 +1,17 @@
 module Structural
   module Model
     class Definer
-      def self.method_memoize(context, name, &value_block)
-        method(context, name) do |object|
-          object.instance_eval do
-            memoize(name, &value_block)
+      def self.method_memoize(context, name, ivar_name, &value_block)
+        context.class_eval do
+          define_method(name) do
+            memoize(ivar_name, &value_block)
           end
         end
       end
 
       def self.method(context, name, &value_block)
-        context.instance_eval do
-          define_method name do
+        context.class_eval do
+          define_method(name) do
             value_block.call(self)
           end
         end

data/lib/structural/model/field.rb

@@ -8,7 +8,7 @@ module Structural
       end
 
       def define
-        Definer.method_memoize(model, name) { |data| value_of(data) }
+        Definer.method_memoize(model, name, ivar_name) { |data| value_of(data) }
         Definer.method(model, "#{name}?") { |obj| presence_of(obj.data) }
         hook_define
       end
@@ -26,18 +26,22 @@ module Structural
       end
 
       def cast(value)
-        TypeCasts.cast(options.fetch(:type, false), value)
+        TypeCasts.cast(options.fetch(:type, value.class), value)
       end
 
       def key
-        options.fetch(:key, name).to_s
+        options.fetch(:key, name).to_sym
+      end
+
+      def ivar_name
+        @ivar_name ||= "@#{@name}"
       end
 
       def default_value
-        proc do
+        @default_value ||= proc do
           if default?
             default
-          else 
+          else
             raise MissingAttributeError, key
           end
         end

data/lib/structural/model/type_casts.rb

@@ -1,12 +1,15 @@
 module Structural
   module Model
     module TypeCasts
+
       def self.cast(type, value)
-        casts.fetch(type, Identity).new(value).cast
+        if value.is_a?(type)
+          value
+        else
+          casts.fetch(type, Identity).cast(value)
+        end
       end
 
-      protected
-
       def self.register(cast)
         casts[cast.type] = cast
       end
@@ -17,92 +20,70 @@ module Structural
         @casts ||= {}
       end
 
-      class Cast
-        def initialize(value)
-          @value = value
-        end
-
-        def cast
-          value.is_a?(type) ? value : conversion
-        end
-
-        def type
-          self.class.type
-        end
-
-        def conversion
-          raise NotImplementedError
-        end
-
-        private
-
+      class Identity
         def self.type
-          raise NotImplementedError
+          ::Identity
         end
 
-        attr_reader :value
-      end
-
-      class Identity < Cast
-        def cast
+        def self.cast(value)
           value
         end
       end
 
-      class Integer < Cast
+      class Integer
         def self.type
           ::Integer
         end
 
-        def conversion
+        def self.cast(value)
           value.to_i
         end
 
         TypeCasts.register(self)
       end
 
-      class Float < Cast
+      class Float
         def self.type
           ::Float
         end
 
-        def conversion
+        def self.cast(value)
           value.to_f
         end
 
         TypeCasts.register(self)
       end
 
-      class Date < Cast
+      class Date
         def self.type
           ::Date
         end
 
-        def conversion
+        def self.cast(value)
           ::Date.parse value
         end
 
         TypeCasts.register(self)
       end
 
-      class Time < Cast
+      class Time
         def self.type
           ::Time
         end
 
-        def conversion
+        def self.cast(value)
           ::Time.parse value
         end
 
         TypeCasts.register(self)
       end
 
-      class Money < Cast
+      class Money
         def self.type
           ::Money
         end
 
-        def conversion
+        def self.cast(value)
           ::Money.new value.to_i
         end
 

data/lib/structural/timestamps.rb

@@ -6,7 +6,7 @@ module Structural
     end
 
     def initialize(data = {})
-      super data.merge(:created_at => data.fetch('created_at', Time.now))
+      super data.merge(:created_at => data.fetch(:created_at, Time.now))
     end
 
     def set(values)

data/lib/structural/version.rb

@@ -1,3 +1,3 @@
 module Structural
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/lib/structural/model/type_casts_spec.rb

@@ -3,19 +3,8 @@ require 'spec_helper'
 module Structural
   module Model
     module TypeCasts
-      describe Cast do
-        it 'requires a type' do
-          expect { Cast.new(1).type }.to raise_error NotImplementedError
-        end
-
-        it 'requires a conversion' do
-          expect { Cast.new(1).conversion }.to raise_error NotImplementedError
-        end
-
-      end
-
       describe Integer do
-        subject { Integer.new("2").cast }
+        subject { Integer.cast("2") }
 
         it 'casts strings to integers' do
           expect(subject).to eql(2)
@@ -23,7 +12,7 @@ module Structural
       end
 
       describe Float do
-        subject { Float.new("2.0").cast }
+        subject { Float.cast("2.0") }
 
         it 'casts strings to floats' do
           expect(subject).to eql(2.0)
@@ -32,25 +21,20 @@ module Structural
 
       describe Date do
         it 'casts strings to dates' do
-          Date.new("06-06-1983").cast.should eq ::Date.new(1983, 6, 6)
+          Date.cast("06-06-1983").should eq ::Date.new(1983, 6, 6)
         end
       end
 
       describe Time do
         it 'casts strings to Times' do
-          Time.new("06-06-1983").cast.should eq ::Time.parse("06-06-1983")
-        end
-
-        it 'does nothing if the value is already of the correct type' do
-          time = ::Time.now
-          Time.new(time).cast.should eq time
+          Time.cast("06-06-1983").should eq ::Time.parse("06-06-1983")
         end
       end
 
       describe Money do
         it 'ints or strings to Money' do
-          Money.new("500").cast.should eq ::Money.new(5_00)
-          Money.new(500).cast.should eq ::Money.new(5_00)
+          Money.cast("500").should eq ::Money.new(5_00)
+          Money.cast(500).should eq ::Money.new(5_00)
         end
       end
     end

data/spec/lib/structural/model_spec.rb

@@ -10,6 +10,7 @@ class TestModel
 
   field :foo
   field :bar, :key => 'baz'
+  field :nested_hash
   field :quux, :default => false
   field :date_of_birth, :type => Date
   field :empty_date, :type => Date
@@ -33,6 +34,7 @@ describe Structural::Model do
       :foo => 3,
       :baz => 6,
       :quxx => 8,
+      :nested_hash => {1 => :one, 2 => :two},
       :test_model => {},
       :date_of_birth => '06-06-1983',
       :aliased_model => {'yak' => 11},
@@ -62,6 +64,10 @@ describe Structural::Model do
       model.quux.should eql(false)
     end
 
+    it 'leaves nested hashes unmodified' do
+      model.nested_hash.should eql({1 => :one, 2 => :two})
+    end
+
     describe "typecast option" do
       it 'typecasts to the provided type if a cast exists' do
         model.date_of_birth.should be_a Date

metadata

@@ -1,138 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: structural
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Russell Dunphy
 - Radek Molenda
 - Jon Doveston
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-11-11 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: money
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A cut down fork of the Id gem developed at On The Beach Ltd.
-email: 
+email:
 - jon.doveston@onthebeach.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .ruby-version
-- .travis.yml
+files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -158,41 +145,31 @@ files:
 - spec/lib/structural/timestamps_spec.rb
 - spec/spec_helper.rb
 - structural.gemspec
-has_rdoc: true
 homepage: https://github.com/onthebeach/structural
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple models based on hashes
-test_files: 
+test_files:
 - spec/lib/structural/model/association_spec.rb
 - spec/lib/structural/model/field_spec.rb
 - spec/lib/structural/model/type_casts_spec.rb