roar 0.11.11 → 0.11.12

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+# 0.11.12
+
+* Moved `::inheritable_array` from `Hypermedia` to `Representer`.
+
 # 0.11.11
 
 * Allow use of `::link(string)`.

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 - 2013 Nick Sutterer and the roar contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/roar/representer.rb

@@ -2,12 +2,39 @@ require 'representable'
 
 module Roar
   module Representer
+    # TODO: move to separate module
+    # DISCUSS: experimental. this will soon be moved to a separate gem
+    module InheritableArray
+      def representable_attrs
+        super.extend(ConfigExtensions)
+      end
+
+      module ConfigExtensions
+        def inheritable_array(name)
+          inheritable_arrays[name] ||= []
+        end
+        def inheritable_arrays
+          @inheritable_arrays ||= {}
+        end
+
+        def inherit(parent)
+          super
+          
+          parent.inheritable_arrays.keys.each do |k|
+            inheritable_array(k).push *parent.inheritable_array(k).clone
+          end
+        end
+      end
+    end
+
     def self.included(base)
       base.class_eval do
         include Representable
       end
     end
 
+    include InheritableArray
+
   private
     def before_serialize(*)
     end

data/lib/roar/representer/feature/hypermedia.rb

@@ -154,31 +154,6 @@ module Roar
             marshal_load(hash.inject({}) { |h, (k,v)| h[k.to_sym] = v; h })
           end
         end
-
-        # TODO: move to separate module
-        # DISCUSS: experimental. this will soon be moved to a separate gem
-        module InheritableArray
-          def representable_attrs
-            super.extend(ConfigExtensions)
-          end
-
-          module ConfigExtensions
-            def inheritable_array(name)
-              inheritable_arrays[name] ||= []
-            end
-            def inheritable_arrays
-              @inheritable_arrays ||= {}
-            end
-
-            def inherit(parent)
-              super
-              
-              parent.inheritable_arrays.keys.each do |k|
-                inheritable_array(k).push *parent.inheritable_array(k).clone
-              end
-            end
-          end
-        end
       end
     end
   end

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.11"
+  VERSION = "0.11.12"
 end

data/roar.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://rubygems.org/gems/roar"
   s.summary     = %q{Resource-oriented architectures in Ruby.}
   s.description = %q{Streamlines the development of RESTful, resource-oriented architectures in Ruby.}
-
+  s.license = 'MIT'
   s.rubyforge_project = "roar"
 
   s.files         = `git ls-files`.split("\n")

data/test/hypermedia_test.rb

@@ -218,6 +218,23 @@ class HyperlinkTest < MiniTest::Spec
         
         end.representable_attrs.inheritable_array(:links).must_equal(["bar", "stadium"])
       end
+
+      it "doesn't mess up with inheritable_array" do  # FIXME: remove this test when uber is out.
+        OpenStruct.new.extend( Module.new do
+                  include Roar::Representer::JSON
+                  include Module.new do
+                    include Roar::Representer::JSON
+                    include Roar::Representer::Feature::Hypermedia
+        
+                    property :bla
+
+                    link( :self) {"bo"}
+                  end
+                  property :blow
+                end).to_json
+
+
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -87,6 +87,7 @@ files:
 - .travis.yml
 - CHANGES.markdown
 - Gemfile
+- LICENSE
 - README.textile
 - Rakefile
 - TODO.markdown
@@ -122,7 +123,8 @@ files:
 - test/test_helper.rb
 - test/xml_representer_test.rb
 homepage: http://rubygems.org/gems/roar
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: