setsumei 0.0.10 → 0.0.12

data/spec/setsumei/describable/string_attribute_spec.rb

@@ -3,23 +3,19 @@ require 'spec_helper'
 module Setsumei
   module Describable
     describe StringAttribute do
-      its(:name) { should == nil }
 
-      describe ".named(name)" do
-        let(:name) { :my_string_field }
+      describe "#== other" do
+        subject { StringAttribute.new }
 
-        subject { StringAttribute.named(name) }
-
-        it { should be_a StringAttribute }
-        its(:name) { should == name }
-
-        it_should_behave_like "it handles options properly"
+        it { should == :string }
+        it { should == StringAttribute }
+        it { should_not eq double }
       end
 
-      describe "#value_for(pre_type_cast_value)" do
+      describe "#cast value" do
         let(:string_attribute) { StringAttribute.new }
 
-        subject { string_attribute.value_for pre_type_cast_value }
+        subject { string_attribute.cast pre_type_cast_value }
 
         context "where the value is a string" do
           let(:pre_type_cast_value) { "I'm already a string" }
@@ -35,61 +31,6 @@ module Setsumei
         end
       end
 
-      describe "#is_an_attribute_of_type?" do
-        let(:string_attribute) { StringAttribute.new }
-
-        subject { string_attribute.is_an_attribute_of_type? type }
-
-        context "where type is :string" do
-          let(:type) { :string }
-          it { should be_true }
-        end
-
-        context "where type is StringAttribute" do
-          let(:type) { StringAttribute }
-          it { should be_true }
-        end
-
-        context "where type is unknown" do
-          let(:type) { mock "an unknown type" }
-          it { should be_false }
-        end
-      end
-
-      describe "set_value_on object, from_value_in: hash" do
-        let(:hash) { Hash.new }
-        let(:key) { "key" }
-        let(:hash_keys) { mock "hash_keys" }
-        let(:value_in_hash) { mock "value_in_hash" }
-        let(:converted_value) { mock "converted_value" }
-
-        let(:object) { mock "object", :my_string_attribute= => nil }
-
-        let(:string_attribute) { StringAttribute.named :my_string_attribute }
-
-        before do
-          Build::Key.stub(:for).and_return(key)
-          hash[key] = value_in_hash
-          string_attribute.stub(:value_for).and_return(converted_value)
-        end
-
-        subject { string_attribute.set_value_on object, from_value_in: hash }
-
-        it "should detect the key it should use to retrieve the value from the hash" do
-          hash.should_receive(:keys).and_return(hash_keys)
-          Build::Key.should_receive(:for).with(:my_string_attribute, given: hash_keys ).and_return(key)
-          subject
-        end
-        it "should convert the value" do
-          string_attribute.should_receive(:value_for).with(value_in_hash).and_return(converted_value)
-          subject
-        end
-        it "should pass object a value to the attribute described by this class" do
-          object.should_receive(:my_string_attribute=).with(converted_value)
-          subject
-        end
-        it_should_behave_like "it handles lookup keys properly"
-      end
     end
   end
 end

data/spec/setsumei/describable/time_attribute_spec.rb

@@ -2,100 +2,42 @@ require 'spec_helper'
 
 module Setsumei
   module Describable
-    describe TimeAttribute do
-      its(:name) { should == nil }
+    describe DateTimeAttribute do
 
-      describe ".named(name)" do
-        let(:name) { :my_time_field }
-
-        subject { TimeAttribute.named(name) }
-
-        it { should be_a TimeAttribute }
-        its(:name) { should == name }
-        its(:format) { should == '%Y-%m-%d %H:%M' }
-
-        context 'format specified' do
-          let(:format) { mock "format" }
-
-          subject { TimeAttribute.named name, format: format }
+      describe "#initialize(format)" do
+        it 'will default to %Y-%m-%d %H:%M' do
+          DateTimeAttribute.new(:time, nil, Time).format.should == '%Y-%m-%d %H:%M'
+        end
 
-          its(:format) { should == format }
+        it 'is configurable' do
+          format = double
+          DateTimeAttribute.new(:time, format, Time).format.should == format
         end
+      end
+
+      describe "#== other" do
+        subject { DateTimeAttribute.new :time, '%Y-%m-%d %H:%M', Time }
 
-        it_should_behave_like "it handles options properly"
+        it { should == :time }
+        it { should == DateTimeAttribute }
+        it { should_not eq double }
       end
 
-      describe "#value_for(pre_type_cast_value)" do
-        let(:attribute) { TimeAttribute.new }
+      describe "#cast value" do
+        let(:attribute) { DateTimeAttribute.new :time, '%Y-%m-%d %H:%M', Time }
 
-        subject { attribute.value_for pre_type_cast_value }
+        subject { attribute.cast value }
 
         context "where pre_type_cast_value is a string" do
-          let(:pre_type_cast_value) { "time" }
+          let(:value) { "time" }
           let(:formatted_value) { mock "formatted_value" }
 
           it "should parse it into a time with format" do
-            Time.should_receive(:strptime).with(pre_type_cast_value,attribute.format).and_return(formatted_value)
+            Time.should_receive(:strptime).with(value, '%Y-%m-%d %H:%M').and_return(formatted_value)
             subject.should == formatted_value
           end
         end
       end
-
-      describe "#is_an_attribute_of_type?" do
-        let(:attribute) { TimeAttribute.new }
-
-        subject { attribute.is_an_attribute_of_type? type }
-
-        context "where type is :time" do
-          let(:type) { :time }
-          it { should be_true }
-        end
-
-        context "where type is TimeAttribute" do
-          let(:type) { TimeAttribute }
-          it { should be_true }
-        end
-
-        context "where type is unknown" do
-          let(:type) { mock "an unknown type" }
-          it { should be_false }
-        end
-      end
-
-      describe "set_value_on object, from_value_in: hash" do
-        let(:hash) { Hash.new }
-        let(:key) { "key" }
-        let(:hash_keys) { mock "hash_keys" }
-        let(:value_in_hash) { mock "value_in_hash" }
-        let(:converted_value) { mock "converted_value" }
-
-        let(:object) { mock "object", :my_time_attribute= => nil }
-
-        let(:time_attribute) { TimeAttribute.named :my_time_attribute }
-
-        before do
-          Build::Key.stub(:for).and_return(key)
-          hash[key] = value_in_hash
-          time_attribute.stub(:value_for).and_return(converted_value)
-        end
-
-        subject { time_attribute.set_value_on object, from_value_in: hash }
-
-        it "should detect the key it should use to retrieve the value from the hash" do
-          hash.should_receive(:keys).and_return(hash_keys)
-          Build::Key.should_receive(:for).with(:my_time_attribute, given: hash_keys ).and_return(key)
-          subject
-        end
-        it "should convert the value" do
-          time_attribute.should_receive(:value_for).with(value_in_hash).and_return(converted_value)
-          subject
-        end
-        it "should pass object a value to the attribute described by this class" do
-          object.should_receive(:my_time_attribute=).with(converted_value)
-          subject
-        end
-        it_should_behave_like "it handles lookup keys properly"
-      end
     end
   end
 end

data/spec/setsumei/describable_spec.rb

@@ -47,8 +47,8 @@ module Setsumei
         it_should_behave_like "it creates an attribute of type", :string,    creating_a: Describable::StringAttribute
         it_should_behave_like "it creates an attribute of type", :float,     creating_a: Describable::FloatAttribute
         it_should_behave_like "it creates an attribute of type", :int,       creating_a: Describable::IntAttribute
-        it_should_behave_like "it creates an attribute of type", :date,      creating_a: Describable::DateAttribute
-        it_should_behave_like "it creates an attribute of type", :time,      creating_a: Describable::TimeAttribute
+        it_should_behave_like "it creates an attribute of type", :date,      creating_a: Describable::DateTimeAttribute
+        it_should_behave_like "it creates an attribute of type", :time,      creating_a: Describable::DateTimeAttribute
 
         it_should_behave_like "it creates an attribute of type", Class.new, creating_a: Describable::ObjectAttribute
       end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 require 'setsumei'
 
 Dir[File.join(File.dirname(__FILE__),"support/**/*.rb")].each { |f| require f }

data/spec/support/shared_examples/attribute_options.rb

@@ -1,10 +1,10 @@
-shared_examples_for "it handles options properly" do
+shared_examples_for "it handles options properly" do |extras = {}|
   its(:lookup_key) { should be_nil }
-  its(:options) { should == {} }
+  its(:options) { should == {}.merge(extras) }
 
   context "when options are specified" do
     subject { described_class.named name, as_a: described_class.to_s.downcase.gsub(/(.*::|attribute)/,'').to_sym, with_additional: :options }
-    its(:options) { should == { with_additional: :options } }
+    its(:options) { should == { with_additional: :options }.merge(extras) }
   end
 
   context "when from_within: is specified" do
@@ -18,7 +18,7 @@ shared_examples_for "it handles options properly" do
       subject { described_class.named name, as_a: described_class.to_s.downcase.gsub(/(.*::|attribute)/,'').to_sym, from_within: key, with_additional: :options }
 
       its(:lookup_key) { should == key }
-      its(:options) { should == { with_additional: :options } }
+      its(:options) { should == { with_additional: :options }.merge(extras) }
     end
   end
 end

data/spec/support/shared_examples/attribute_type_creation.rb

@@ -12,7 +12,7 @@ shared_examples "it creates an attribute of type" do |_type,options|
     context "where options are specified" do
       it "should set the options upon the attribute" do
         subject.define :field, as_a: _type, with: :options
-        subject.defined_attributes[:field].options.should == { with: :options }
+        subject.defined_attributes[:field].options.should == { with: :options }.merge(options.fetch(:extra_options,{}))
       end
     end
   end

metadata

@@ -1,61 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: setsumei
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.12
 platform: ruby
 authors:
 - Jon Rowe
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2011-07-18 00:00:00.000000000 +01:00
-default_executable: 
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDVjCCAj6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBRMQ4wDAYDVQQDDAVoZWxs
+  bzEXMBUGCgmSJomT8ixkARkWB2pvbnJvd2UxEjAQBgoJkiaJk/IsZAEZFgJjbzES
+  MBAGCgmSJomT8ixkARkWAnVrMB4XDTEzMDIwMzA4MTgwNloXDTE0MDIwMzA4MTgw
+  NlowUTEOMAwGA1UEAwwFaGVsbG8xFzAVBgoJkiaJk/IsZAEZFgdqb25yb3dlMRIw
+  EAYKCZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJ1azCCASIwDQYJKoZI
+  hvcNAQEBBQADggEPADCCAQoCggEBAMhs6ng/SRrYfG7RtQx8liJTZs8tpz7PBnlH
+  qyOwuU0weJc7nh6C9C8LGyJzpkbjJJo1rfTMg7huDyL14Py82dfMDomApif8jNNI
+  8KtviAgB1DrWq0fCDLtu/M77+yuVV3OhDdrAFaBkT/euvdJ8cAKrLxbJ+klgvrcB
+  FK+c4PUV3/zBKghe0l7FuDhyQCsuLNDbWyFvDS97tPjeN6yWuszwg22vZMDdsuzN
+  Cj3M4LLSkbrt+AOUcysEJxI4t6uv2U1bRzHsDfAF0RI/Q7OMtUr+Dtz/2YJ47KKs
+  51ZRjLLGHd10XrIfFSfGyJj1dMbDgLsEBj1sFH4e6dy7gau8TaUCAwEAAaM5MDcw
+  CQYDVR0TBAIwADAdBgNVHQ4EFgQULu5JH2g7RAjoXaZt+fbrfNDI9IkwCwYDVR0P
+  BAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQAf5A4kB769DPKGjPZ++v42FwVi7X7v
+  RpufPs6R4YHyzHXaJmAqnhleZhVJijBgsdb2SigNRbg+IK8XYHg7jkonMgO8OS3D
+  C6w8VB5bI0PqyDOwCGcQkYHYlZZWCghAyBTSBowHAekMb9V3QjJtJ8XkizjshETO
+  ZCVI2AObjlJi8I10aK2tSo9sv2riCKZ92BVSM13zYWn+C/eCP/m9BDiw37UQtuQq
+  2feWfO4gCNmvfFjULOAYHq9JHEjN5SLSXvj5HdSnDcCyIfJKn5Ya3JahWQaWIsXf
+  /NPE/mB57TOwj+d7XUa2NC4HUadF8R51IYEcIB0PpIEzJlKtfXFcOZxO
+  -----END CERTIFICATE-----
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161615340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161615340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2161614920 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161614920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: autotest-standalone
-  requirement: &2161614500 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161614500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &2161614080 !ruby/object:Gem::Requirement
-    none: false
+  name: autotest-standalone
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161614080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool for describing API's as ruby objects. Currently supports building
   these objects from JSON
 email:
@@ -66,6 +97,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -73,18 +105,19 @@ files:
 - lib/setsumei/build.rb
 - lib/setsumei/build/key.rb
 - lib/setsumei/describable.rb
+- lib/setsumei/describable/attribute.rb
 - lib/setsumei/describable/boolean_attribute.rb
 - lib/setsumei/describable/collection.rb
-- lib/setsumei/describable/date_attribute.rb
+- lib/setsumei/describable/date_time_attribute.rb
 - lib/setsumei/describable/float_attribute.rb
 - lib/setsumei/describable/int_attribute.rb
 - lib/setsumei/describable/object_attribute.rb
 - lib/setsumei/describable/string_attribute.rb
-- lib/setsumei/describable/time_attribute.rb
 - lib/setsumei/version.rb
 - setsumei.gemspec
 - spec/setsumei/build/key_spec.rb
 - spec/setsumei/build_spec.rb
+- spec/setsumei/describable/attribute_spec.rb
 - spec/setsumei/describable/boolean_attribute_spec.rb
 - spec/setsumei/describable/collection_spec.rb
 - spec/setsumei/describable/date_attribute_spec.rb
@@ -96,37 +129,35 @@ files:
 - spec/setsumei/describable_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_an_attribute_of_type_matcher.rb
-- spec/support/shared_examples/attribute_lookup_key_support.rb
 - spec/support/shared_examples/attribute_options.rb
 - spec/support/shared_examples/attribute_type_creation.rb
-has_rdoc: true
 homepage: https://github.com/JonRowe/setsumei
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for describing API's as ruby objects
 test_files:
 - spec/setsumei/build/key_spec.rb
 - spec/setsumei/build_spec.rb
+- spec/setsumei/describable/attribute_spec.rb
 - spec/setsumei/describable/boolean_attribute_spec.rb
 - spec/setsumei/describable/collection_spec.rb
 - spec/setsumei/describable/date_attribute_spec.rb
@@ -138,6 +169,5 @@ test_files:
 - spec/setsumei/describable_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_an_attribute_of_type_matcher.rb
-- spec/support/shared_examples/attribute_lookup_key_support.rb
 - spec/support/shared_examples/attribute_options.rb
 - spec/support/shared_examples/attribute_type_creation.rb