active_api 0.1.0 → 0.2.1

data/README.rdoc

@@ -158,6 +158,7 @@ While I (Jeff Dean) wrote all of the code in this repo, the code was inspired by
 
 * Mike Dalessio
 * Peter Jaros
+* Ben Woosely
 
 == Development
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/active_api.gemspec

@@ -1,12 +1,15 @@
+# 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{active_api}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Dean"]
-  s.date = %q{2009-07-05}
+  s.date = %q{2009-12-02}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -42,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/zilkey/active_api}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An api layer for ruby}
   s.test_files = [
     "spec/active_api/complex_type_spec.rb",
@@ -71,3 +74,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.2"])
   end
 end
+

data/lib/active_api.rb

@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'activesupport'
+require 'active_support'
 require 'nokogiri'
-
 require 'uri'
 
 require 'active_api/builder'

data/lib/active_api/definition.rb

@@ -8,8 +8,12 @@ module ActiveApi
       @fields           = options[:fields] || []
     end
 
-    def attribute(name, type = :string, options = {})
-      field options.merge(:name => name, :type => type, :field_type => :attribute)
+    def attribute(*args)
+      options = args.extract_options!
+      options[:type] ||= :string
+      options.merge! :name => args.first, 
+                     :field_type => :attribute
+      field options
     end
 
     def element(name, type = :string, options = {})

data/spec/api_spec.rb

@@ -41,7 +41,7 @@ module ActiveApi
       before do
         @schema = Schema.version(:v1) do |xsl|
           xsl.define :article do |t|
-            t.string   :title
+            t.string :title
           end
         end
         @article = Article.new :title => Faker::Company.bs
@@ -107,7 +107,7 @@ module ActiveApi
         end
         element = Collection.new [@article], :node => :article, :schema => @schema
         doc = element.build_xml.doc
-        doc.xpath("/articles/article[@published_on=1956-03-05]").should be
+        doc.xpath("/articles/article[@published_on='1956-03-05']").should_not be_empty
       end
 
       it "emits nil when the attribute value is nil" do
@@ -119,7 +119,7 @@ module ActiveApi
         @article.published_on = nil
         element = Collection.new [@article], :node => :article, :schema => @schema
         doc = element.build_xml.doc
-        doc.xpath("/articles/article[@published_on='']").should be
+        doc.xpath("/articles/article[@published_on='']").should_not be_empty
       end
     end
 
@@ -142,8 +142,8 @@ module ActiveApi
         end
 
         element = Collection.new [@article],
-                                          :node => :article,
-                                          :schema => @schema
+                                 :node => :article,
+                                 :schema => @schema
         doc = element.build_xml.doc
         doc.xpath("/articles/article/comments/comment/text").first.inner_text.should == @comment.text
       end
@@ -153,14 +153,14 @@ module ActiveApi
       before do
         @schema = Schema.version(:v1) do |xsl|
           xsl.define :article do |t|
-            t.attribute :id, :value => proc {|attribute| "foo" }
-            t.string    :id, :value => proc {|element| "foo" }
-            t.has_many  :comments
+            t.attribute :id, :value => proc {|attribute| "foo attribute" }
+            t.string :id, :value => proc {|element| "foo" }
+            t.has_many :comments
           end
 
           xsl.define :comment do |t|
-            t.string      :article_title, :value => proc{|element| element.object.article.title }
-            t.belongs_to  :user
+            t.string :article_title, :value => proc{|element| element.object.article.title }
+            t.belongs_to :user
           end
 
           xsl.define :user do |t|
@@ -181,32 +181,32 @@ module ActiveApi
 
       it "emits the value of the value proc for attributes" do
         element = Collection.new [@article1],
-                                          :node => :article,
-                                          :schema => @schema
+                                 :node => :article,
+                                 :schema => @schema
         doc = element.build_xml.doc
-        doc.xpath("/articles/article[@id=foo]").should be
+        doc.xpath("/articles/article[@id='foo attribute']").should_not be_empty
       end
 
       it "emits the value of the value proc for elements" do
         element = Collection.new [@article1],
-                                          :node => :article,
-                                          :schema => @schema
+                                 :node => :article,
+                                 :schema => @schema
         doc = element.build_xml.doc
         doc.xpath("/articles/article/id").first.inner_text.should == "foo"
       end
 
       it "emits the value of the value proc, which is passed an element containing a reference to the object" do
         element = Collection.new [@article1],
-                                          :node => :article,
-                                          :schema => @schema
+                                 :node => :article,
+                                 :schema => @schema
         doc = element.build_xml.doc
         doc.xpath("/articles/article/comments/comment/article_title").first.inner_text.should == @article1.title
       end
 
       it "emits the value of the value proc, which is passed an element containing a reference all ancestor objects" do
         element = Collection.new [@article1, @article2],
-                                          :node => :article,
-                                          :schema => @schema
+                                 :node => :article,
+                                 :schema => @schema
         doc = element.build_xml.doc
         doc.xpath("/articles/article").length.should == 2
         doc.xpath("/articles/article/comments/comment/user/title").first.inner_text.should == @article1.title

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'spec'
+require 'spec/autorun'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_api
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeff Dean
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-05 00:00:00 -04:00
+date: 2009-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An api layer for ruby