structure 0.12.1 → 0.12.2

data/Rakefile

@@ -3,10 +3,8 @@ require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-desc 'Run all specs in spec directory'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = "spec/**/*_spec.rb"
-  t.rspec_opts = %w(-fd -c)
 end
 
 task :default => [:spec]

data/lib/structure.rb

@@ -1,3 +1,9 @@
+begin
+  ::JSON::JSON_LOADED
+rescue NameError
+  require 'json'
+end
+
 # Ruby doesn't have a Boolean class, so let's feign one.
 unless Object.const_defined?(:Boolean)
   module Boolean; end
@@ -5,7 +11,7 @@ unless Object.const_defined?(:Boolean)
   class FalseClass; include Boolean; end
 end
 
-# A Struct-like data container.
+# A key/value container for modeling ephemeral data.
 class Structure
   include Enumerable
 
@@ -23,6 +29,11 @@ class Structure
       key name, Structure
     end
 
+    def json_create(object)
+      object.delete('json_class')
+      new(object)
+    end
+
     # Defines an attribute key.
     #
     # Takes a name, an optional type, and an optional hash of options.
@@ -114,13 +125,36 @@ class Structure
   #
   # Optionally, seeds the structure with a hash of attributes.
   def initialize(seed = {})
-    initialize_attributes
+    @attributes = {}
+    self.class.default_attributes.each do |key, value|
+      @attributes[key] = value.is_a?(Array) ? value.dup : value
+    end
+
     seed.each { |key, value| self.send("#{key}=", value) }
   end
 
   # A hash of attributes.
   attr_reader :attributes
 
+  def as_json(options = nil)
+    # create a subset of the attributes by applying :only or :except
+    subset = if options
+      if attrs = options[:only]
+        @attributes.slice(*Array.wrap(attrs))
+      elsif attrs = options[:except]
+        @attributes.except(*Array.wrap(attrs))
+      else
+        @attributes.dup
+      end
+    else
+      @attributes.dup
+    end
+
+    klass = self.class.name
+    { JSON.create_id => klass }.
+      merge(subset)
+  end
+
   def each(&block)
     @attributes.each { |value| block.call(value) }
   end
@@ -130,24 +164,22 @@ class Structure
     @attributes.keys
   end
 
+  def to_json(*args)
+    klass = self.class.name
+    { JSON.create_id => klass }.
+      merge(@attributes).
+      to_json(*args)
+  end
+
   # Returns an array populated with the attribute values.
   def values
     @attributes.values
   end
 
   # Compares this object with another object for equality. A Structure is equal
-  # to the other object when latter is also a Structure and the two objects'
-  # attributes are equal.
+  # to the other object when latter is of the same class and the two objects'
+  # attributes are the same.
   def ==(other)
-    other.is_a?(Structure) && @attributes == other.attributes
-  end
-
-  private
-
-  def initialize_attributes
-    @attributes = {}
-    self.class.default_attributes.each do |key, value|
-      @attributes[key] = value.is_a?(Array) ? value.dup : value
-    end
+    other.is_a?(self.class) && @attributes == other.attributes
   end
 end

data/lib/structure/version.rb

@@ -1,3 +1,3 @@
 class Structure
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

data/spec/fixtures/cities_with_neighborhoods.yml

@@ -0,0 +1,7 @@
+---
+- id: 1
+  name: New York
+  neighborhoods:
+  - name: Manhattan
+  - name: Brooklyn
+  - name: Queens

data/spec/models/city.rb

@@ -5,5 +5,10 @@ class City < Structure
 
   set_data_path File.expand_path("../../fixtures/cities.yml", __FILE__)
 
+  key         :name
+  embeds_many :neighborhoods
+end
+
+class Neighborhood < Structure
   key :name
 end

data/spec/structure/json_spec.rb

@@ -26,10 +26,6 @@ describe Structure do
   let(:json) { '{"json_class":"Person","name":"Joe","age":null,"friends":[]}' }
 
   context "without Active Support" do
-    before(:all) do
-      require 'structure/json'
-    end
-
     it_behaves_like "a JSON interface"
   end
 
@@ -37,7 +33,6 @@ describe Structure do
     before(:all) do
       require 'active_support/ordered_hash'
       require 'active_support/json'
-      load 'structure/json.rb'
     end
 
     after(:all) do

data/spec/structure/static_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 class Structure
   describe "A static structure" do
+    def replace_fixture(new_path)
+      City.instance_variable_set(:@all, nil)
+      fixture = File.expand_path("../../fixtures/#{new_path}", __FILE__)
+      City.set_data_path(fixture)
+    end
+
     it "is enumerable" do
       City.should be_an Enumerable
     end
@@ -29,11 +35,14 @@ class Structure
       end
     end
 
-    context "when sourced data does not include ids" do
+    context "when sourcing data without ids" do
       before(:all) do
-        City.instance_variable_set(:@all, nil)
-        fixture = File.expand_path("../../fixtures/cities_without_id.yml", __FILE__) 
-        City.set_data_path(fixture)
+        @old_path = City.instance_variable_get(:@data_path)
+        replace_fixture("cities_without_id.yml")
+      end
+
+      after(:all) do
+        replace_fixture(@old_path)
       end
 
       it "should auto-increment the ids of loaded records" do
@@ -55,5 +64,22 @@ class Structure
         end
       end
     end
+
+    context "when sourcing nested models" do
+      before(:all) do
+        @old_path = City.instance_variable_get(:@data_path)
+        replace_fixture("cities_with_neighborhoods.yml")
+      end
+
+      after(:all) do
+        replace_fixture(@old_path)
+      end
+
+      it "loads nested models" do
+        pending
+        neighborhoods = City.first.neighborhoods
+        neighborhoods.first.should be_a Neighborhood
+      end
+    end
   end
 end

data/structure.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   {
     'activesupport'  => '>= 3.0',
+    'rake'           => '~> 0.9',
     'rspec'          => '~> 2.6',
     'ruby-debug19'   => '~> 0.11.6'
   }.each do |lib, version|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 1
-  version: 0.12.1
+  - 2
+  version: 0.12.2
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -14,12 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +01:00
+date: 2011-07-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +29,25 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: rake
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,11 +57,11 @@ dependencies:
         - 6
         version: "2.6"
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,7 +72,8 @@ dependencies:
         - 6
         version: 0.11.6
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id004
 description: Structure is a key/value container for modeling ephemeral data.
 email: 
 - code@papercavalier.com
@@ -79,10 +93,10 @@ files:
 - Rakefile
 - benchmark.rb
 - lib/structure.rb
-- lib/structure/json.rb
 - lib/structure/static.rb
 - lib/structure/version.rb
 - spec/fixtures/cities.yml
+- spec/fixtures/cities_with_neighborhoods.yml
 - spec/fixtures/cities_without_id.yml
 - spec/models/book.rb
 - spec/models/city.rb
@@ -106,6 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2262708410600119149
       segments: 
       - 0
       version: "0"
@@ -114,6 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2262708410600119149
       segments: 
       - 0
       version: "0"
@@ -126,6 +142,7 @@ specification_version: 3
 summary: A key/value container for modeling ephemeral data
 test_files: 
 - spec/fixtures/cities.yml
+- spec/fixtures/cities_with_neighborhoods.yml
 - spec/fixtures/cities_without_id.yml
 - spec/models/book.rb
 - spec/models/city.rb

data/lib/structure/json.rb

@@ -1,41 +0,0 @@
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
-  ::JSON::JSON_LOADED
-  require 'json'
-end
-
-class Structure
-  def self.json_create(object)
-    object.delete('json_class')
-    new(object)
-  end
-
-  def to_json(*args)
-    klass = self.class.name
-    { JSON.create_id => klass }.
-      merge(@attributes).
-      to_json(*args)
-  end
-end
-
-if defined? ActiveSupport
-  class Structure
-    def as_json(options = nil)
-      # create a subset of the attributes by applying :only or :except
-      subset = if options
-        if attrs = options[:only]
-          @attributes.slice(*Array.wrap(attrs))
-        elsif attrs = options[:except]
-          @attributes.except(*Array.wrap(attrs))
-        else
-          @attributes.dup
-        end
-      else
-        @attributes.dup
-      end
-
-      klass = self.class.name
-      { JSON.create_id => klass }.
-        merge(subset)
-    end
-  end
-end