id 0.0.8 → 0.0.9

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gemspec
+gem 'test-unit'
+gem 'json', '~> 1.7.7'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    id (0.0.7)
+    id (0.0.9)
+      activemodel
       activesupport
       money
       optional
@@ -9,15 +10,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    builder (3.0.4)
     diff-lcs (1.2.1)
     i18n (0.6.4)
+    json (1.7.7)
     money (5.1.1)
       i18n (~> 0.6.0)
-    multi_json (1.7.2)
-    optional (0.0.4)
+    multi_json (1.7.3)
+    optional (0.0.6)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -30,11 +36,14 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    test-unit (2.5.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   id!
+  json (~> 1.7.7)
   rspec
   simplecov
+  test-unit

data/id.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'id'
-  s.version       = '0.0.8'
+  s.version       = '0.0.9'
   s.date          = '2013-03-28'
   s.summary       = "Simple models based on hashes"
   s.description   = "Developed at On The Beach Ltd. Contact russell.dunphy@onthebeach.co.uk"
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency "optional"
   s.add_dependency "money"
   s.add_dependency "activesupport"
+  s.add_dependency "activemodel"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"

data/lib/id.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'active_support/inflector'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'

data/lib/id/model.rb

@@ -14,43 +14,35 @@ module Id
       self.class.new(data.except(*keys.map(&:to_s)))
     end
 
-    private
-
-    def self.included(base)
-      base.extend(Descriptor)
+    def eql? other
+      other.is_a?(Id::Model) && other.data.eql?(self.data)
     end
+    alias_method :==, :eql?
 
-    def memoize(f, &b)
-      instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call)
+    def hash
+      data.hash
     end
 
-    module Descriptor
-
-      def field(f, options={})
-        (options[:optional] ? FieldOption : Field).new(self, f, options).define
-      end
-
-      def has_one(f, options={})
-        (options[:optional] ? HasOneOption : HasOne).new(self, f, options).define
-      end
+    def as_form
+      @form_object ||= self.class.form_object.new(self)
+    end
 
-      def has_many(f, options={})
-        HasMany.new(self, f, options).define
-      end
+    def errors
+      as_form.errors
+    end
 
-      def compound_field(f, fields, options={})
-        CompoundField.new(self, f, fields, options).define
-      end
+    def valid?
+      as_form.valid?
+    end
 
-      def builder
-        builder_class.new(self)
-      end
+    private
 
-      private
+    def self.included(base)
+      base.extend(Descriptor)
+    end
 
-      def builder_class
-        @builder_class ||= Class.new { include Builder }
-      end
+    def memoize(f, &b)
+      instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call)
     end
 
   end

data/lib/id/model/all.rb

@@ -1,3 +1,4 @@
+require_relative 'descriptor'
 require_relative 'type_casts'
 require_relative 'field'
 require_relative 'association'
@@ -5,3 +6,4 @@ require_relative 'has_one'
 require_relative 'has_many'
 require_relative 'builder'
 require_relative 'compound_field'
+require_relative 'form'

data/lib/id/model/descriptor.rb

@@ -0,0 +1,52 @@
+module Id
+  module Model
+    module Descriptor
+
+      def field(f, options={})
+        (options[:optional] ? FieldOption : Field).new(self, f, options).define
+      end
+
+      def has_one(f, options={})
+        (options[:optional] ? HasOneOption : HasOne).new(self, f, options).define
+      end
+
+      def has_many(f, options={})
+        HasMany.new(self, f, options).define
+      end
+
+      def compound_field(f, fields, options={})
+        CompoundField.new(self, f, fields, options).define
+      end
+
+      def builder
+        builder_class.new(self)
+      end
+
+      def form &block
+        form_object.send :instance_exec, &block
+      end
+
+      def form_object
+        base = self
+        @form_object ||= Class.new(Form) do
+          instance_exec do
+            define_singleton_method :model_name do
+              ActiveModel::Name.new(self, nil, base.name)
+            end
+          end
+        end
+      end
+
+      def to_proc
+        ->(data) { new data }
+      end
+
+      private
+
+      def builder_class
+        @builder_class ||= Class.new { include Builder }
+      end
+
+    end
+  end
+end

data/lib/id/model/field.rb

@@ -8,6 +8,16 @@ module Id
         @options = options
       end
 
+      def define_form_field
+        field = self
+        model.form_object.send :define_method, name do
+          memoize field.name do
+            Option[model.send(field.name)].flatten.value_or nil if model.data.has_key? field.key
+          end
+        end
+        model.form_object.send :attr_writer, name
+      end
+
       def define_getter
         field = self
         model.send :define_method, name do
@@ -32,6 +42,7 @@ module Id
         define_getter
         define_setter
         define_is_present
+        define_form_field
       end
 
       def cast(value)
@@ -69,10 +80,8 @@ module Id
         field = self
         model.send :define_method, name do
           memoize field.name do
-            if d = data.fetch(field.key, &field.default_value)
-              Some[field.cast d]
-            else
-              None
+            Option[data.fetch(field.key, &field.default_value)].map do |d|
+              field.cast d
             end
           end
         end

data/lib/id/model/form.rb

@@ -0,0 +1,37 @@
+module Id
+  module Model
+    class Form
+      include ActiveModel::Validations
+      include ActiveModel::Conversion
+      extend  ActiveModel::Naming
+
+      def self.i18n_scope
+        :id
+      end
+
+      def initialize(model)
+        @model = model
+      end
+
+      def persisted?
+        false
+      end
+
+      def to_model
+        self
+      end
+
+      private
+
+      def method_missing(name, *args, &block)
+        model.send(name, *args, &block)
+      end
+
+      def memoize(f, &b)
+        instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call)
+      end
+
+      attr_reader :model
+    end
+  end
+end

data/spec/lib/id/model/form_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+class Gerbil
+  include Id::Model
+
+  field :name
+  field :paws
+
+  form do
+    validates_presence_of :name
+    validates_length_of :name, maximum: 4
+  end
+
+  def name_in_caps
+    name.upcase
+  end
+
+end
+
+module Id
+  module Model
+    describe Form do
+
+      let (:gerbil) { Gerbil.new(name: 'Berty') }
+      let (:form)   { gerbil.as_form }
+
+      subject { gerbil.as_form }
+
+      it_behaves_like "ActiveModel"
+
+      it 'is delegated to by the model for errors' do
+        gerbil.errors.should eq form.errors
+        gerbil.valid?.should eq form.valid?
+      end
+
+      it 'responds to to_model' do
+        subject.to_model.should eq subject
+      end
+
+      it 'has the same fields as the model' do
+        form.name.should eq 'Berty'
+      end
+
+      it 'works with active model validations' do
+        form.should_not be_valid
+        form.name = 'Bert'
+        form.should be_valid
+      end
+
+      it 'delegates to the model' do
+        form.name_in_caps.should eq 'BERTY'
+      end
+    end
+  end
+end

data/spec/lib/id/model_spec.rb

@@ -157,4 +157,40 @@ describe Id::Model do
     end
   end
 
+  describe "#==" do
+    it 'is equal to another id model with the same data' do
+      one = TestModel.new(foo: 1)
+      two = TestModel.new(foo: 1)
+      one.should eq two
+    end
+
+    it 'is not equal to two models with different data' do
+      one = TestModel.new(foo: 1)
+      two = TestModel.new(foo: 2)
+      one.should_not eq two
+    end
+  end
+
+  describe "#hash" do
+    it 'allows id models to be used as hash keys' do
+      one = TestModel.new(foo: 1)
+      two = TestModel.new(foo: 1)
+      hash = { one => :found }
+      hash[two].should eq :found
+    end
+    it 'they are different keys if the data is different' do
+      one = TestModel.new(foo: 1)
+      two = TestModel.new(foo: 2)
+      hash = { one => :found }
+      hash[two].should be_nil
+      hash[one].should eq :found
+    end
+  end
+
+  describe ".to_proc" do
+    it 'allows eta expansion of the class name to its constructor' do
+      [{foo: 1}].map(&TestModel).first.should be_a TestModel
+      [{foo: 1}].map(&TestModel).first.foo.should eq 1
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ end
 
 require 'rspec'
 require_relative '../lib/id'
+require_relative 'support/active_model_lint'
 
 
 RSpec.configure do |config|

data/spec/support/active_model_lint.rb

@@ -0,0 +1,14 @@
+shared_examples_for "ActiveModel" do
+  require 'test/unit/assertions'
+  require 'active_model/lint'
+  include Test::Unit::Assertions
+  include ActiveModel::Lint::Tests
+
+  ActiveModel::Lint::Tests.public_instance_methods.map { |method| method.to_s }.grep(/^test/).each do |method|
+    example(method.gsub('_', ' ')) { send method }
+  end
+
+  def model
+    subject
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,19 +131,24 @@ files:
 - lib/id/model/association.rb
 - lib/id/model/builder.rb
 - lib/id/model/compound_field.rb
+- lib/id/model/descriptor.rb
 - lib/id/model/field.rb
+- lib/id/model/form.rb
 - lib/id/model/has_many.rb
 - lib/id/model/has_one.rb
 - lib/id/model/type_casts.rb
 - lib/id/timestamps.rb
 - spec/lib/id/model/association_spec.rb
 - spec/lib/id/model/builder_spec.rb
+- spec/lib/id/model/field_spec.rb
+- spec/lib/id/model/form_spec.rb
 - spec/lib/id/model/has_one_spec.rb
 - spec/lib/id/model/type_casts_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb
 - spec/lib/mike_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_model_lint.rb
 homepage: http://github.com/onthebeach/id
 licenses: []
 post_install_message: 
@@ -155,10 +176,13 @@ summary: Simple models based on hashes
 test_files:
 - spec/lib/id/model/association_spec.rb
 - spec/lib/id/model/builder_spec.rb
+- spec/lib/id/model/field_spec.rb
+- spec/lib/id/model/form_spec.rb
 - spec/lib/id/model/has_one_spec.rb
 - spec/lib/id/model/type_casts_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb
 - spec/lib/mike_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_model_lint.rb
 has_rdoc: