restful_serializer 0.1.4 → 0.1.5

data/.gitignore

@@ -1,4 +1,6 @@
 *.swp
+.rvmrc
+log/*
 .vimrc
 .current
 spec/*.log

data/README.rdoc

@@ -6,7 +6,7 @@ If the model has a name column, it will be used to describe the resource.
 
 This library does not attempt to provide href info for transitions, or deal much with questions of authorization beyond what is specified in the serialization configuration lines.  It assumes that these issues would be resolved in the controller.  It assumes standard naming conventions for routes.
 
-Tested with Rails 2.3.11.  Requires the Rails framework to be loaded.
+Requires Rails 3.
 
 == Example 
 
@@ -124,3 +124,10 @@ Example output:
 = More Docs
 
 Please see the Restful rdoc and the specs for more details.
+
+* https://github.com/jpartlow/restful_serializer
+* API: http://rubydoc.info/gems/restful_serializer/frames
+
+= Rails 2
+
+This gem requires Rails 3.  To use it with Rails 2, you will need version 0.1.4, which is tagged 'rails2' in github.

data/Rakefile

@@ -5,22 +5,21 @@ require 'rubygems'
 require 'rake'
 require 'restful/version'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = Restful::VERSION
 
   rdoc.rdoc_dir = 'rdoc'

data/lib/restful.rb

@@ -1,5 +1,7 @@
 # This file is part of restful_serializer.  Copyright 2011 Joshua Partlow.  This is free software, see the LICENSE file for details.
 
+require 'deep_merge/rails_compat'
+
 # This library is used to decorate ActiveRecord with methods to assist in generating 
 # Restful content for Web Services.
 #
@@ -171,20 +173,6 @@ module Restful
   end
 end
 
-# Rails 2.3 Hash is extended with :deep_merge and :deep_merge! already, and route
-# generation requires these versions.  We're using the +deep_merge+ gem's versions,
-# and need to setup aliases to ensure that Rails versions remain available while
-# we are still able to access the gem's versions.
-Hash.class_eval do
-  alias_method :rails_deep_merge, :deep_merge
-  alias_method :rails_deep_merge!, :deep_merge!
-  require 'deep_merge'
-  alias_method :_rs_deep_merge, :deep_merge
-  alias_method :_rs_deep_merge!, :deep_merge!
-  alias_method :deep_merge, :rails_deep_merge
-  alias_method :deep_merge!, :rails_deep_merge!
-end
-
 ActiveRecord::Base.send(:include, Restful::Extensions)
-ActiveRecord::Associations::AssociationProxy.send(:include, Restful::Extensions)
+ActiveRecord::Associations::CollectionProxy.send(:include, Restful::Extensions)
 Array.send(:include, Restful::Extensions)

data/lib/restful/configuration.rb

@@ -21,7 +21,7 @@ module Restful
       def self.included(base)
         base.class_eval do
           extend ClassMethods
-          class_inheritable_array :options
+          class_attribute :options
           self.options = []
         end
       end
@@ -131,7 +131,7 @@ module Restful
       # will be raised.
       #
       # Empty container options and defaulted options are skipped.
-      def deep_merge!(other)
+      def deeper_merge!(other)
         other_hash = case other
           when Configurable then other.to_hash(:ignore_empty => true, :skip_defaults => true)
           else other
@@ -139,7 +139,7 @@ module Restful
 
         hash = to_hash(:ignore_empty => true, :skip_defaults => true)
         new_configurable = self.class.new
-        hash._rs_deep_merge!(other_hash)
+        hash.deeper_merge!(other_hash)
         return new_configurable.set(hash)
       end
 
@@ -310,6 +310,7 @@ module Restful
     #
     # Resources configurations are set with a call to +register_resource+.
     class WebService < Configurator
+      self.options = []
       option :name
       option :api_prefix
       option :default_url_options, :type => :hash
@@ -368,6 +369,7 @@ module Restful
     #   options specifically set for the class will be used.  Default false.
     #
     class Resource < Configurator
+      self.options = []
       option :name_method, :default => :name
       option :url_for
       option :associations, :type => :hash
@@ -399,6 +401,7 @@ module Restful
     #
     # See ActiveRecord::Serialization.to_json for more details
     class ARSerialization < Configurator
+      self.options = []
       option :only, :type => :array
       option :except, :type => :array 
       option :include, :type => :hash, :element_type => 'Restful::Configuration::ARSerialization'

data/lib/restful/serializer.rb

@@ -48,7 +48,7 @@ module Restful
   #   # "http://example.com/user/1/comments"
   #
   class Url
-    include ActionController::UrlWriter
+    include Rails.application.routes.url_helpers
     @@initialized = false
 
     attr_accessor :options
@@ -157,9 +157,9 @@ module Restful
  
     # Encode as a resource hash. 
     def serialize
-      case 
-        when subject.respond_to?(:attribute_names) then _serialize_active_record
+      case
         when subject.kind_of?(Array) then _serialize_array
+        when subject.respond_to?(:attribute_names) then _serialize_active_record
         else ActiveSupport::JSON.decode(subject.to_json) # just capture the hash of the object structure
       end
     end
@@ -225,9 +225,9 @@ module Restful
       self.resource_configuration = 
         (klass == base_klass || class_configuration.no_inherited_options) ? 
           class_configuration.deep_clone :
-          base_configuration.deep_merge!(class_configuration)
+          base_configuration.deeper_merge!(class_configuration)
 
-      self.resource_configuration = resource_configuration.deep_merge!(passed_configuration)
+      self.resource_configuration = self.resource_configuration.deeper_merge!(passed_configuration)
 
       yield(resource_configuration) if block_given?
 
@@ -236,7 +236,7 @@ module Restful
 
     def _serialize_active_record
       restful = DeepHash[
-        klass => ActiveRecord::Serialization::Serializer.new(subject, active_record_serialization_options).serializable_record
+        klass => subject.serializable_hash(active_record_serialization_options)
       ]
       restful['name'] = name if name
       restful['href'] = href
@@ -248,7 +248,7 @@ module Restful
     end
 
     def _serialize_array
-      restful = subject.map do |e|
+      restful = subject.to_a.map do |e|
         array_options = options.clone
         array_options = { :shallow => true }.merge(array_options)
         Serializer.new(e, web_service, array_options, &configure_block).serialize

data/lib/restful/version.rb

@@ -1,3 +1,3 @@
 module Restful
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/restful_serializer.gemspec

@@ -23,9 +23,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files spec/*`.split("\n")
 
-  s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-  s.add_runtime_dependency(%q<activerecord>, [">= 2.1.0", "<3.0.0"])
-  s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0", "<3.0.0"])
-  s.add_runtime_dependency(%q<actionpack>, [">= 2.1.0", "<3.0.0"])
-  s.add_runtime_dependency(%q<deep_merge>, [">= 0.1.0"])
+  s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+  s.add_development_dependency(%q<sqlite3>)
+  s.add_runtime_dependency(%q<rails>, [">= 3.0.0", "< 4.0.0"])
+  s.add_runtime_dependency(%q<deep_merge>, [">= 1.0.0"])
 end

data/spec/configuration_spec.rb

@@ -148,7 +148,7 @@ describe Restful::Configuration do
       end  
   
       it "should provide a deep merge" do
-        merged = @test.deep_merge!(@different)
+        merged = @test.deeper_merge!(@different)
         merged.name.should == @different.name
         merged.subs[:sub1].should == @sub1
         merged.subs[:sub2].stuff.should == @sub2.stuff + @difsub2.stuff
@@ -157,9 +157,9 @@ describe Restful::Configuration do
       end
 
       it "should raise errors if attempt to deep merge with different options" do
-        @test.deep_merge!(nil).should == @test
-        lambda { @test.deep_merge!(@sub1) }.should raise_error(ArgumentError)
-        lambda { @test.deep_merge!(:frotz => :spaniel) }.should raise_error(ArgumentError)
+        @test.deeper_merge!(nil).should == @test
+        lambda { @test.deeper_merge!(@sub1) }.should raise_error(ArgumentError)
+        lambda { @test.deeper_merge!(:frotz => :spaniel) }.should raise_error(ArgumentError)
       end
 
     end

data/spec/database.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 
-gem 'activerecord', '>=2.1.0'
+gem 'activerecord', '>=3.0.0'
 require 'active_record'
+require 'logger'
 
 ActiveRecord::Base.establish_connection({'adapter' => 'sqlite3', 'database' => ':memory:'})
 ActiveRecord::Base.logger = Logger.new("#{File.dirname(__FILE__)}/active_record.log")

data/spec/serializer_spec.rb

@@ -3,15 +3,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 # These routes are only required by some tests, but route generation issues crop
 # up depending on the order in which restful/* files are required.  The reasons
 # are mysterious, though they may have something to do with ActionController::UrlWriter
-ActionController::Routing::Routes.clear!
-ActionController::Routing::Routes.draw do |map|
-  map.resources :foos
-  map.prefix_foo 'prefix/foos/:id', :controller => 'foos', :action => 'show'
-  map.custom_foo 'custom_foo/:id', :controller => 'foos', :action => 'show'
-  map.resources :bars do |bars|
-    bars.resources :dingos
+# ^^^ this was a rails2 note and may no longer apply
+Rails.application.routes.clear!
+Rails.application.routes.draw do
+  resources :foos
+  controller :foos do
+    match 'prefix/foos/:id' => :show, :as => :prefix_foo
+    match 'custom_foo/:id' => :show, :as => :custom_foo
+  end
+  resources :bars do
+    resources :dingos
   end 
-  map.resources :things
+  resources :things
 end
 
 describe Restful::Serializer do
@@ -80,11 +83,11 @@ describe Restful::Serializer do
   end
 
   def check_routing
-    ActionController::Routing::Routes.routes.size.should == 30
-    by_method = ActionController::Routing::Routes.routes.group_by { |r|
-      r.conditions[:method]
+    Rails.application.routes.routes.size.should == 30
+    by_method = Rails.application.routes.routes.group_by { |r|
+      method = r.verb.blank? ? nil : r.verb.downcase.to_sym
     }
-#    ActionController::Routing::Routes.routes.each { |r| puts r }
+#    Rails.application.routes.routes.each { |r| puts r }
     by_method[:get].size.should == 4 * 4
     by_method[:put].size.should == 4
     by_method[:post].size.should == 4

data/spec/spec_helper.rb

@@ -1,21 +1,35 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
-require 'action_controller'
-require 'database'
 
-require 'spec'
-require 'spec/autorun'
-require 'pp'
+ENV['RAILS_ENV'] = 'test'
 
-require 'restful'
+require 'rubygems'
+gem 'actionpack', '>=3.0.0' 
+gem 'activesupport', '>=3.0.0' 
+gem 'activerecord', '>=3.0.0'
+gem 'railties', '>=3.0.0'
 
-#class TestLogger
-#  [:debug, :info, :warn, :error].each do |m|
-#    define_method(m) { |message| puts "#{m.to_s.upcase}: #{message}" }
-#  end
-#end
+# Only the parts of rails we want to use
+# if you want everything, use "rails/all"
+require "action_controller/railtie"
+ 
+# Define the application and configuration
+module RestfulTest 
+  class Application < ::Rails::Application
+    # configuration here if needed
+    config.active_support.deprecation = :stderr
+  end
+end
+ 
+# Initialize the application
+RestfulTest::Application.initialize!
 
-Spec::Runner.configure do |config|
+require 'rspec'
+
+RSpec.configure do |config|
 
 end
+
+require 'database'
+require 'pp'
+require 'restful'

metadata

@@ -1,137 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: restful_serializer
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Josh Partlow
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &15152020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *15152020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &15151260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *15151260
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &15149300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: deep_merge
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *15149300
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: &15147460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id005
-description: This library is used to decorate ActiveRecord with methods to assist in generating Restful content for Web Services.
+  prerelease: false
+  version_requirements: *15147460
+description: This library is used to decorate ActiveRecord with methods to assist
+  in generating Restful content for Web Services.
 email: jpartlow@glatisant.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .gitignore
 - LICENSE
 - README.rdoc
@@ -148,44 +83,33 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/web_service_spec.rb
-has_rdoc: true
 homepage: http://github.com/jpartlow/restful_serializer
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main=README.rdoc
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Helps with serializing activerecord instances as Restful resources.
-test_files: 
+test_files:
 - spec/configuration_spec.rb
 - spec/database.rb
 - spec/restful_spec.rb