structure 0.7.1 → 0.8.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use 1.9.2@structure

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 0.8
+
+* Make JSON patch compatible with Active Support.
+* Remove URI from list of types.

data/README.md

@@ -5,7 +5,8 @@ Structure is a Struct-like key/value container for modeling ephemeral data in
 Ruby.
 
 Structure typecasts, uses basic association idioms, and converts to and from
-JSON seamlessly.
+JSON seamlessly, even when nested in structures or other structure-like
+objects.
 
     #_                                                                       d
     ##_                                                                     d#
@@ -109,4 +110,3 @@ Structure supports the following types:
 * Integer
 * String
 * Structure
-* URI

data/lib/structure.rb

@@ -1,5 +1,3 @@
-require 'uri'
-
 # Ruby doesn't have a Boolean class, so let's feign one.
 unless Object.const_defined?(:Boolean)
   module Boolean; end
@@ -11,7 +9,7 @@ end
 class Structure
   include Enumerable
 
-  TYPES = [Array, Boolean, Float, Hash, Integer, String, Structure, URI]
+  TYPES = [Array, Boolean, Float, Hash, Integer, String, Structure]
 
   class << self
 
@@ -31,7 +29,7 @@ class Structure
     # Takes a name and an optional hash of options. Available options are:
     #
     # * :type, which can be Array, Boolean, Float, Hash, Integer, String,
-    # Structure, or URI. If not specified, type defaults to String.
+    # or Structure. If not specified, type defaults to String.
     # * :default, which sets the default value for the attribute.
     #
     #    class Book

data/lib/structure/json.rb

@@ -1,3 +1,5 @@
+require 'structure'
+
 unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
   ::JSON::JSON_LOADED
   require 'json'
@@ -16,3 +18,26 @@ class Structure
       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

data/lib/structure/version.rb

@@ -1,3 +1,3 @@
 class Structure
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/spec/models/person.rb

@@ -1,6 +1,5 @@
 class Person < Structure
   key :name
   key :age, :type => Integer
-  key :website, :type => URI
   has_many :friends
 end

data/spec/structure/json_spec.rb

@@ -1,30 +1,66 @@
 require 'spec_helper'
 
-describe Structure do
-  context "when `structure/json' is required" do
-    let(:person) { Person.new(:name => 'Joe', :age => 28, :website => 'http://example.com') }
-    let(:json) { '{"json_class":"Person","name":"Joe","age":28,"website":"http://example.com","friends":[]}' }
+shared_examples_for "a JSON interface" do
+  it "dumps to JSON" do
+    person.to_json.should eql json
+  end
 
+  it "loads from JSON" do
+    JSON.parse(json).should == person
+  end
+
+  context "when nesting other structures" do
     before do
+      person.friends = [Person.new(:name => 'Jane')]
+    end
+
+    it "loads them into their corresponding structures" do
+      json = person.to_json
+      JSON.parse(json).friends.first.should be_a Person
+    end
+  end
+end
+
+describe Structure do
+  let(:person) { Person.new(:name => 'Joe') }
+  let(:json) { '{"json_class":"Person","name":"Joe","age":null,"friends":[]}' }
+
+  context "without Active Support" do
+    before(:all) do
       require 'structure/json'
     end
 
-    it "dumps to JSON" do
-      person.to_json.should eql json
+    it_behaves_like "a JSON interface"
+  end
+
+  context "with Active Support" do
+    before(:all) do
+      require 'active_support/ordered_hash'
+      require 'active_support/json'
+      load 'structure/json.rb'
     end
 
-    it "loads from JSON" do
-      JSON.parse(json).should == person
+    after(:all) do
+      Object.send(:remove_const, :ActiveSupport)
     end
 
-    context "when nesting other structures" do
-      before do
-        person.friends = [Person.new(:name => 'Jane')]
+    it_behaves_like "a JSON interface"
+
+    describe "#as_json" do
+      it "returns a hash" do
+        person.as_json.should be_a Hash
+      end
+
+      it "selects a subset of attributes" do
+        as_json = person.as_json(:only => :name)
+        as_json.should have_key :name
+        as_json.should_not have_key :age
       end
 
-      it "loads them into their corresponding structures" do
-        json = person.to_json
-        JSON.parse(json).friends.first.should be_a Person
+      it "rejects a subset of attributes" do
+        as_json = person.as_json(:except => :name)
+        as_json.should_not have_key :name
+        as_json.should have_key :age
       end
     end
   end

data/spec/structure_spec.rb

@@ -41,7 +41,6 @@ describe Structure do
     it "returns the default attributes for the structure" do
       Person.send(:default_attributes).should == { :name    => nil,
                                                    :age     => nil,
-                                                   :website => nil,
                                                    :friends => [] }
       Book.send(:default_attributes).should == { :title   => nil,
                                                  :authors => nil }

data/structure.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "structure"
 
   {
-    'rspec'         => '~> 2.6.0',
-    'ruby-debug19'  => '~> 0.11.6'
+    'activesupport'  => '>= 3.0',
+    'rspec'          => '~> 2.6',
+    'ruby-debug19'   => '~> 0.11.6'
   }.each do |lib, version|
     s.add_development_dependency lib, version
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -14,13 +14,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 +01:00
+date: 2011-06-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,14 +42,13 @@ dependencies:
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        version: "2.6"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,7 +59,7 @@ dependencies:
         - 6
         version: 0.11.6
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |-
   Structure is a Struct-like key/value container for modeling ephemeral data
       in Ruby.
@@ -60,6 +73,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md