populr 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/asset.rb

@@ -12,10 +12,9 @@ class Asset < RestfulModel
     @file = file
     self.title = title
     self.description = description
-    self.link = link
   end
 
-  def to_json(options = {})
+  def as_json(options = {})
     hash = super(options)
     hash[:file] = @file if options[:api_representation] && @file
     hash

data/lib/pop.rb

@@ -4,6 +4,7 @@ require 'tracer'
 class Pop < RestfulModel
 
   class TemplateRequired < StandardError; end
+  class AssetMustBeSaved < StandardError; end
 
   attr_accessor :template_id
   attr_accessor :name
@@ -25,7 +26,10 @@ class Pop < RestfulModel
 
     if template.is_a?(Template)
       self.template_id = template._id
-      @_api = template._api
+      self.unpopulated_api_regions = template.api_regions
+      self.unpopulated_api_tags = template.api_tags
+
+      @_api = template.instance_variable_get :@_api
     else
       @_api = api_or_template
     end
@@ -76,7 +80,10 @@ class Pop < RestfulModel
     assets = [assets] unless assets.is_a?(Array)
 
     @newly_populated_regions[region_identifier] ||= []
-    @newly_populated_regions[region_identifier].concat(assets.map {|a| a._id })
+    @newly_populated_regions[region_identifier].concat(assets.map {|a|
+      raise AssetMustBeSaved.new unless a._id
+      a._id
+    })
     self.unpopulated_api_regions.delete(region_identifier)
   end
 

data/lib/populr.rb

@@ -13,6 +13,13 @@ class Populr
   class AccessDenied < StandardError; end
   class ResourceNotFound < StandardError; end
   class UnexpectedResponse < StandardError; end
+  class APIError < StandardError
+    attr_accessor :error_type
+    def initialize(type, error)
+      super(error)
+      self.error_type = type
+    end
+  end
 
   attr_accessor :api_server
   attr_reader :api_key
@@ -22,11 +29,12 @@ class Populr
     # Handle HTTP errors and RestClient errors
     raise ResourceNotFound.new if result.code.to_i == 404
     raise AccessDenied.new if result.code.to_i == 403
-    raise UnexpectedResponse.new(result.msg) if result.is_a?(Net::HTTPClientError)
 
     # Hande content expectation errors
     raise UnexpectedResponse.new if options[:expected_class] && result.body.empty?
     json = JSON.parse(result.body)
+    raise APIError.new(json['error_type'], json['error']) if json.is_a?(Hash) && json['error_type']
+    raise UnexpectedResponse.new(result.msg) if result.is_a?(Net::HTTPClientError)
     raise UnexpectedResponse.new if options[:expected_class] && !json.is_a?(options[:expected_class])
     json
 

data/lib/restful_model.rb

@@ -39,6 +39,10 @@ class RestfulModel
     setters.each do |setter|
       getter = setter.to_s[0..setter.to_s.index('=')-1]
       hash[getter] = self.send(getter)
+
+      if hash[getter].class.method_defined? :as_json
+        hash[getter] = hash[getter].as_json(options)
+      end
     end
     hash
   end

data/lib/restful_model_collection.rb

@@ -19,6 +19,7 @@ class RestfulModelCollection
   end
 
   def find(id)
+    return nil unless id
     get_restful_model(id)
   end
 
@@ -36,6 +37,8 @@ class RestfulModelCollection
 
   def inflate_collection(items = [])
     @_collection = []
+
+    return unless items.is_a?(Array)
     items.each do |json|
       if @model_class < RestfulModel
         model = @model_class.new(self)
@@ -63,7 +66,8 @@ class RestfulModelCollection
     RestClient.get(url){ |response,request,result|
       json = Populr.interpret_response(result, {:expected_class => Object})
       if @model_class < RestfulModel
-        model = @model_class.new(self)
+        model = @model_class.new(@_api)
+        model.instance_variable_set(:@_parent, @_parent)
         model.inflate(json)
       else
         model = @model_class.new(json)

data/populr.gemspec

@@ -0,0 +1,75 @@
+# 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 = "populr"
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Gotow"]
+  s.date = "2013-04-18"
+  s.description = "Gem for interacting with the Populr.me API"
+  s.email = "ben@populr.me"
+  s.extra_rdoc_files = [
+    "LICENSE.md",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.md",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/asset.rb",
+    "lib/document_asset.rb",
+    "lib/domain.rb",
+    "lib/image_asset.rb",
+    "lib/pop.rb",
+    "lib/populr.rb",
+    "lib/restful_model.rb",
+    "lib/restful_model_collection.rb",
+    "lib/template.rb",
+    "lib/tracer.rb",
+    "populr.gemspec",
+    "spec/pop_spec.rb",
+    "spec/populr_spec.rb",
+    "spec/restful_model_collection_spec.rb",
+    "spec/restful_model_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tracer_spec.rb"
+  ]
+  s.homepage = "http://github.com/bengotow/populr"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Gem for interacting with the Populr.me API"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.6"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    else
+      s.add_dependency(%q<rest-client>, [">= 1.6"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<rest-client>, [">= 1.6"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

data/spec/pop_spec.rb

@@ -8,6 +8,23 @@ describe 'Pop' do
     @api = Populr.new('key')
   end
 
+  describe "#initialize" do
+    it "should accept an API connection followed by a template" do
+      template = Template.new(@api)
+      template._id = '123'
+      pop = Pop.new(@api, template)
+      pop.template_id.should == '123'
+    end
+
+    it "should accept just a template" do
+      template = Template.new(@api)
+      template._id = '123'
+      pop = Pop.new(template)
+      pop.template_id.should == '123'
+    end
+
+  end
+
   describe "#inflate" do
     it "should inflate tracers into embedded tracer objects" do
       pop = Pop.new(@api)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: populr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70289664776560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
+  version_requirements: *70289664776560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70289664776020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70289664776020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70289664775420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *70289664775420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70289664774880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.5
+  version_requirements: *70289664774880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70289664774400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,12 +65,7 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
+  version_requirements: *70289664774400
 description: Gem for interacting with the Populr.me API
 email: ben@populr.me
 executables: []
@@ -116,6 +91,7 @@ files:
 - lib/restful_model_collection.rb
 - lib/template.rb
 - lib/tracer.rb
+- populr.gemspec
 - spec/pop_spec.rb
 - spec/populr_spec.rb
 - spec/restful_model_collection_spec.rb
@@ -137,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1796578390559359755
+      hash: -2374986328273655785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem for interacting with the Populr.me API