serialization_scopes 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/serialization_scopes.rb

@@ -1,32 +1,41 @@
 module SerializationScopes
+  extend ActiveSupport::Concern
 
-  def self.included(base)
-    base.extend ClassMethods
-    base.class_inheritable_reader    :serialization_scopes
-    base.write_inheritable_attribute :serialization_scopes, {}
+  included do
+    class_inheritable_reader    :serialization_scopes
+    write_inheritable_attribute :serialization_scopes, {}
   end
 
   module ClassMethods
+
     def serialization_scope(name, options = {})
       serialization_scopes[name.to_sym] = options
     end
 
     def scoped_serialization_options(options = {})
-      name   = options.delete(:scope)
-      scopes = name.present? && serialization_scopes[name.to_sym] ? serialization_scopes[name.to_sym] : serialization_scopes[:default]
-      scopes.each do |key, values|
-        options[key] ||= Array(values)
-        options[key] = Array(options[key]) & Array(values)
+      options ||= {}
+      name    = (options || {})[:scope]
+      scopes  = name.present? && serialization_scopes[name.to_sym] ? serialization_scopes[name.to_sym] : serialization_scopes[:default]
+      scopes.each do |key, scope_options|
+        custom_options = options[key]
+        options[key] = if key == :except
+          custom_options ? (Array.wrap(custom_options) + Array.wrap(scope_options)).uniq : Array.wrap(scope_options)
+        elsif [:only, :methods, :include].include?(key)
+          custom_options ? Array.wrap(custom_options) & Array.wrap(scope_options) : Array.wrap(scope_options)
+        else
+          custom_options ? custom_options : scope_options
+        end
       end if scopes
       options
     end
+
   end
 
   def to_xml(options = {})
     super self.class.scoped_serialization_options(options)
   end
 
-  def to_json(options = {})
+  def as_json(options = {})
     super self.class.scoped_serialization_options(options)
   end
 
@@ -34,4 +43,8 @@ end
 
 ActiveRecord::Base.class_eval do
   include SerializationScopes
-end
+end if defined?(ActiveRecord::Base)
+
+ActiveResource::Base.class_eval do
+  include SerializationScopes
+end if defined?(ActiveResource::Base)

metadata

@@ -1,68 +1,47 @@
 --- !ruby/object:Gem::Specification 
 name: serialization_scopes
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
+- Evgeniy Dolzhenko
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  requirement: *id001
-  prerelease: false
-  type: :runtime
-  name: activerecord
-description: Adds named scopes for ActiveRecord serialization methods (to_xml, to_json)
-email: dimitrij@blacksquaremedia.com
+dependencies: []
+
+description: Adds named scopes for ActiveRecord/ActiveResource serialization methods (to_xml, to_json)
+email: info@blacksquaremedia.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- README
-- Rakefile
 - VERSION
+- README
 - lib/serialization_scopes.rb
-- lib/serialization_scopes/matchers.rb
 - lib/serialization_scopes/matchers/serialize_matcher.rb
+- lib/serialization_scopes/matchers.rb
 - rails/init.rb
-- serialization_scopes.gemspec
-- spec/helper.rb
-- spec/serialization_scopes_spec.rb
 has_rdoc: true
 homepage: http://github.com/dim/serialization_scopes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -70,26 +49,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Named scopes for ActiveRecord serialization methods (to_xml, to_json)
-test_files: 
-- spec/helper.rb
-- spec/serialization_scopes_spec.rb
+summary: Named scopes for ActiveRecord/ActiveResource serialization methods (to_xml, to_json)
+test_files: []
+

data/.gitignore

@@ -1 +0,0 @@
-pkg/

data/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem "activerecord", '>= 3.0.0.rc'
-gem "rspec", ">= 2.0.0.beta.17"
-gem "rake"
-gem "jeweler"

data/Gemfile.lock

@@ -1,46 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activesupport (3.0.0.rc)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rake (0.8.7)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.22)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (>= 3.0.0.rc)
-  jeweler
-  rake
-  rspec (>= 2.0.0.beta.17)

data/Rakefile

@@ -1,26 +0,0 @@
-require 'bundler'
-Bundler.setup
-
-require 'rake'
-require 'rspec/mocks/version'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-desc 'Default: run specs.'
-task :default => :spec
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "serialization_scopes"
-    gemspec.summary = "Named scopes for ActiveRecord serialization methods (to_xml, to_json)"
-    gemspec.description = "Adds named scopes for ActiveRecord serialization methods (to_xml, to_json)"
-    gemspec.email = "dimitrij@blacksquaremedia.com"
-    gemspec.homepage = "http://github.com/dim/serialization_scopes"
-    gemspec.authors = ["Dimitrij Denissenko"]
-    gemspec.add_runtime_dependency "activerecord", "> 2.5.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-end

data/serialization_scopes.gemspec

@@ -1,56 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{serialization_scopes}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2010-08-19}
-  s.description = %q{Adds named scopes for ActiveRecord serialization methods (to_xml, to_json)}
-  s.email = %q{dimitrij@blacksquaremedia.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "lib/serialization_scopes.rb",
-     "lib/serialization_scopes/matchers.rb",
-     "lib/serialization_scopes/matchers/serialize_matcher.rb",
-     "rails/init.rb",
-     "serialization_scopes.gemspec",
-     "spec/helper.rb",
-     "spec/serialization_scopes_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/dim/serialization_scopes}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Named scopes for ActiveRecord serialization methods (to_xml, to_json)}
-  s.test_files = [
-    "spec/helper.rb",
-     "spec/serialization_scopes_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["> 2.5.0"])
-    else
-      s.add_dependency(%q<activerecord>, ["> 2.5.0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, ["> 2.5.0"])
-  end
-end
-

data/spec/helper.rb

@@ -1,26 +0,0 @@
-ENV["RAILS_ENV"] ||= 'test'
-$:.unshift File.dirname(__FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
-
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end
-
-require 'active_record'
-require 'serialization_scopes'
-require 'rspec'
-
-RSpec.configure do |c|
-  c.mock_with :rspec
-end
-
-ActiveRecord::Base.include_root_in_json = false

data/spec/serialization_scopes_spec.rb

@@ -1,68 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-describe SerializationScopes do
-
-  before do
-    ActiveRecord::Base.stub!(:establish_connection)
-  end
-
-  class SomeModel < ActiveRecord::Base
-    serialization_scope :default, :only => [:id, :name], :methods => :currency
-    serialization_scope :admin, :only => [:id, :secret]
-    after_initialize    :set_defaults
-
-    def self.columns
-      @columns ||= [
-        ActiveRecord::ConnectionAdapters::Column.new('id', nil, 'integer'),
-        ActiveRecord::ConnectionAdapters::Column.new('name', nil, 'string'),
-        ActiveRecord::ConnectionAdapters::Column.new('secret', nil, 'string')
-      ]
-    end
-
-    def set_defaults
-      self.id     = 1
-      self.name   = 'Any'
-      self.secret = 'key'
-    end
-
-    def currency
-      'USD'
-    end
-  end
-
-  it 'should constraint to_xml' do
-    SomeModel.new.to_xml.should == %(<?xml version="1.0" encoding="UTF-8"?>
-<some-model>
-  <name>Any</name>
-  <id type="integer">1</id>
-  <currency>USD</currency>
-</some-model>
-)
-  end
-
-  def as_hash(options = {})
-    ActiveSupport::JSON.decode(SomeModel.new.to_json(options))
-  end
-
-  it 'should constraint to_json' do
-    as_hash.should == { "name" => "Any", "currency" => "USD", "id" => 1 }
-  end
-
-  it 'should allow further restrictions' do
-    as_hash(:only => :name).should == { "name" => "Any", "currency" => "USD" }
-    as_hash(:methods => []).should == { "name" => "Any", "id" => 1 }
-  end
-
-  it 'should deny extensions if (default) scope is selected' do
-    as_hash(:only => [:id, :secret]).should == { "id" => 1, "currency" => "USD" }
-  end
-
-  it 'should have separate behaviours for different scopes' do
-    as_hash(:scope => :admin).should == { "id" => 1, "secret" => "key" }
-  end
-
-  it 'should fallback to default scope if invalid scope is given' do
-    as_hash(:scope => :invalid).should == { "name" => "Any", "currency" => "USD", "id" => 1 }
-  end
-
-end