to_api 1.0.1 → 1.0.2

data/lib/to_api.rb

@@ -1,8 +1,10 @@
+require 'active_record'
+
 class ActiveRecord::Base
   def to_api(*includes) #assumes all attribute types are fine
     hash = {}
     valid_includes = (self.class.reflect_on_all_associations.map(&:name).map(&:to_s) | self.valid_api_includes)
-    
+  
     include_hash = {}
     includes.each do |i| 
       if i.kind_of?(Hash)
@@ -13,9 +15,9 @@ class ActiveRecord::Base
         include_hash[i] = []
       end
     end
-    
+  
     include_hash.delete_if{|k,v| !valid_includes.include?(k)}
-    
+  
     attributes.each do |k, v|
       attribute_includes = include_hash[k] || []
       v = v.to_api(*attribute_includes) if v.respond_to?(:to_api)
@@ -27,24 +29,24 @@ class ActiveRecord::Base
       api_obj = self.send(relation)
       hash[relation.to_s] = api_obj.respond_to?(:to_api) ? api_obj.to_api(*relation_includes) : api_obj
     end
-    
+  
     hash
   end
-  
+
   # override in models
   def valid_api_includes
     []
   end
 end
 
-module Enumerable
+#Sadly, Scope isn't enumerable
+class ActiveRecord::NamedScope::Scope
   def to_api(*includes)
     map{|e|e.to_api(*includes)}
   end
 end
 
-#Sadly, Scope isn't enumerable
-class ActiveRecord::NamedScope::Scope
+module Enumerable
   def to_api(*includes)
     map{|e|e.to_api(*includes)}
   end
@@ -81,4 +83,10 @@ class Symbol
   def to_api(*includes)
     to_s
   end
+end
+
+class NilClass
+  def to_api
+    self
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
-require 'active_record'
-require File.join(File.dirname(__FILE__), "..", "lib", 'to_api')
+require "rubygems"
+require "bundler/setup"
+require 'spec'
+require 'to_api'

data/spec/to_api_spec.rb

@@ -127,6 +127,12 @@ describe '#to_api' do
       [a].to_api(['bar']).should == [:apiz]
     end
   end
+  
+  describe nil do
+    it "returns nil" do
+      nil.to_api.should be_nil
+    end
+  end
 
   describe ActiveRecord::Base do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: to_api
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -20,23 +20,7 @@ date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -52,82 +36,55 @@ dependencies:
         segments: 
         - 3
         version: "3"
-  name: activerecord
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: activerecord
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  requirement: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
-  name: rspec
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :development
+  name: rspec
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  requirement: *id005
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
-  name: activerecord
-  requirement: *id006
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  name: rake
+  prerelease: false
+  version_requirements: *id003
 description: Helper for simplifying JSON api creation.
 email: shawn42@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- Gemfile
-- Gemfile.lock
-- README
-- Rakefile
-- VERSION
 - lib/to_api.rb
+- README
 - spec/spec_helper.rb
 - spec/to_api_spec.rb
-- to_api.gemspec
 has_rdoc: true
 homepage: http://github.com/atomicobject/to_api
 licenses: []

data/Gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-gem "rake"
-gem "activerecord", ">= 2.3", "< 3"
-group :test do
-    gem 'rspec', '1.3.0', :require => false
-end
-gem "jeweler"

data/Gemfile.lock

@@ -1,22 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
-    activesupport (2.3.5)
-    git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rspec (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (>= 2.3, < 3)
-  jeweler
-  rake
-  rspec (= 1.3.0)

data/Rakefile

@@ -1,39 +0,0 @@
-require "rubygems"
-require "bundler/setup"
-
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "to_api"
-    gem.rubyforge_project = "to_api"
-    gem.summary = %Q{Helper for simplifying JSON api creation}
-    gem.description = %Q{Helper for simplifying JSON api creation.}
-    gem.email = "shawn42@gmail.com"
-    gem.homepage = "http://github.com/atomicobject/to_api"
-    gem.authors = ["Shawn Anderson","Ryan Fogle"]
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "jeweler"
-    gem.add_dependency 'activerecord'
-    gem.test_files = FileList['{spec,test}/**/*.rb']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-begin
-  require 'spec/rake/spectask'
-  desc "Run the code examples in spec/"
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_files = FileList["spec/**/*_spec.rb"]
-  end
-  task :default => :spec
-
-rescue LoadError
-  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
-end
-
-# vim: syntax=Ruby

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/to_api.gemspec

@@ -1,67 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{to_api}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Shawn Anderson", "Ryan Fogle"]
-  s.date = %q{2010-12-10}
-  s.description = %q{Helper for simplifying JSON api creation.}
-  s.email = %q{shawn42@gmail.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "README",
-    "Rakefile",
-    "VERSION",
-    "lib/to_api.rb",
-    "spec/spec_helper.rb",
-    "spec/to_api_spec.rb",
-    "to_api.gemspec"
-  ]
-  s.homepage = %q{http://github.com/atomicobject/to_api}
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{to_api}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Helper for simplifying JSON api creation}
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/to_api_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<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3", "< 3"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 2.3", "< 3"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 2.3", "< 3"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
-end
-