donors_choose2 0.0.1 → 0.0.2

data/lib/donors_choose/project.rb

@@ -1,7 +1,8 @@
 module DonorsChooseApi
   class Project < DonorsChooseApi::ApiBaseModel
     include DonorsCountFetcher
-    DEFAULT_KEY = "DONORSCHOOSE"
+    DEFAULT_KEY      = "DONORSCHOOSE"
+    DONORS_URL_REGEX = /http[s]?:\/\/www.donorschoose.org\/project\/[a-zA-Z-]+\/\d+\//i
 
     field :donors_choose_id, :key    => 'id'
     field :proposal_url, :key        => 'proposalURL'
@@ -38,8 +39,12 @@ module DonorsChooseApi
     end
 
     def self.find_by_url(link_url, api_key=DEFAULT_KEY)
-      response = parse(client.data_for(link_url, api_key))
-      new(response['proposals'].first)
+      if link_url =~ DONORS_URL_REGEX
+        response = parse(client.data_for(link_url, api_key))
+        new(response['proposals'].first)
+      else
+        "Invalid Donors Choose Url"
+      end
     end
 
     def self.find_by_id(donors_choose_id, api_key=DEFAULT_KEY)

data/lib/donors_choose/version.rb

@@ -1,3 +1,3 @@
 module DonorsChoose
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/project_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe DonorsChooseApi::Project do
-  SAMPLE_URL = "http://www.donorschoose.org/project/appletv-makes-classroom-tech-imazing/774020/"
-  SAMPLE_ID = "811882"
-  ATTR_HASH = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }
+  SAMPLE_URL  = "http://www.donorschoose.org/project/appletv-makes-classroom-tech-imazing/774020/"
+  SAMPLE_ID   = "811882"
+  BAD_URL     = "http://www.donorschoose.org/project/blah"
+  ATTR_HASH   = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }
   SAMPLE_JSON = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }.to_json
 
   describe '.client' do
@@ -20,7 +21,11 @@ describe DonorsChooseApi::Project do
 
   describe '.find_by_url(link_url, api_key)' do
    it 'returns an instance of the project class' do
-     DonorsChooseApi::Project.find_by_url(SAMPLE_URL).should be_a(DonorsChooseApi::Project)
+      DonorsChooseApi::Project.find_by_url(SAMPLE_URL).should be_a(DonorsChooseApi::Project)
+   end
+
+   it 'returns an error message if the donors choose url is not valid' do
+      DonorsChooseApi::Project.find_by_url(BAD_URL).should == "Invalid Donors Choose Url"
    end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: donors_choose2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70239107182600 !ruby/object:Gem::Requirement
+  requirement: &70161744258540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239107182600
+  version_requirements: *70161744258540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70239107181900 !ruby/object:Gem::Requirement
+  requirement: &70161744257900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239107181900
+  version_requirements: *70161744257900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239107181140 !ruby/object:Gem::Requirement
+  requirement: &70161744256700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239107181140
+  version_requirements: *70161744256700
 description: Ruby wrapper for the Donors Choose Api
 email:
 - michael.v.verdi@gmail.com
@@ -99,3 +99,4 @@ test_files:
 - spec/fixtures/sample_donors_choose_response.html
 - spec/project_spec.rb
 - spec/spec_helper.rb
+has_rdoc: