donors_choose2 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,8 @@
1
1
  module DonorsChooseApi
2
2
  class Project < DonorsChooseApi::ApiBaseModel
3
3
  include DonorsCountFetcher
4
- DEFAULT_KEY = "DONORSCHOOSE"
4
+ DEFAULT_KEY = "DONORSCHOOSE"
5
+ DONORS_URL_REGEX = /http[s]?:\/\/www.donorschoose.org\/project\/[a-zA-Z-]+\/\d+\//i
5
6
 
6
7
  field :donors_choose_id, :key => 'id'
7
8
  field :proposal_url, :key => 'proposalURL'
@@ -38,8 +39,12 @@ module DonorsChooseApi
38
39
  end
39
40
 
40
41
  def self.find_by_url(link_url, api_key=DEFAULT_KEY)
41
- response = parse(client.data_for(link_url, api_key))
42
- new(response['proposals'].first)
42
+ if link_url =~ DONORS_URL_REGEX
43
+ response = parse(client.data_for(link_url, api_key))
44
+ new(response['proposals'].first)
45
+ else
46
+ "Invalid Donors Choose Url"
47
+ end
43
48
  end
44
49
 
45
50
  def self.find_by_id(donors_choose_id, api_key=DEFAULT_KEY)
@@ -1,3 +1,3 @@
1
1
  module DonorsChoose
2
- VERSION = "0.0.1"
2
+ VERSION = "0.0.2"
3
3
  end
data/spec/project_spec.rb CHANGED
@@ -1,9 +1,10 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe DonorsChooseApi::Project do
4
- SAMPLE_URL = "http://www.donorschoose.org/project/appletv-makes-classroom-tech-imazing/774020/"
5
- SAMPLE_ID = "811882"
6
- ATTR_HASH = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }
4
+ SAMPLE_URL = "http://www.donorschoose.org/project/appletv-makes-classroom-tech-imazing/774020/"
5
+ SAMPLE_ID = "811882"
6
+ BAD_URL = "http://www.donorschoose.org/project/blah"
7
+ ATTR_HASH = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }
7
8
  SAMPLE_JSON = { 'id' => SAMPLE_ID, 'fundURL' => 'http://foo.com', 'gradeLevel' => {'name' => 'Kindergarten'} }.to_json
8
9
 
9
10
  describe '.client' do
@@ -20,7 +21,11 @@ describe DonorsChooseApi::Project do
20
21
 
21
22
  describe '.find_by_url(link_url, api_key)' do
22
23
  it 'returns an instance of the project class' do
23
- DonorsChooseApi::Project.find_by_url(SAMPLE_URL).should be_a(DonorsChooseApi::Project)
24
+ DonorsChooseApi::Project.find_by_url(SAMPLE_URL).should be_a(DonorsChooseApi::Project)
25
+ end
26
+
27
+ it 'returns an error message if the donors choose url is not valid' do
28
+ DonorsChooseApi::Project.find_by_url(BAD_URL).should == "Invalid Donors Choose Url"
24
29
  end
25
30
  end
26
31
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: donors_choose2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-18 00:00:00.000000000 Z
12
+ date: 2012-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: faraday
16
- requirement: &70239107182600 !ruby/object:Gem::Requirement
16
+ requirement: &70161744258540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70239107182600
24
+ version_requirements: *70161744258540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: nokogiri
27
- requirement: &70239107181900 !ruby/object:Gem::Requirement
27
+ requirement: &70161744257900 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70239107181900
35
+ version_requirements: *70161744257900
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &70239107181140 !ruby/object:Gem::Requirement
38
+ requirement: &70161744256700 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70239107181140
46
+ version_requirements: *70161744256700
47
47
  description: Ruby wrapper for the Donors Choose Api
48
48
  email:
49
49
  - michael.v.verdi@gmail.com
@@ -99,3 +99,4 @@ test_files:
99
99
  - spec/fixtures/sample_donors_choose_response.html
100
100
  - spec/project_spec.rb
101
101
  - spec/spec_helper.rb
102
+ has_rdoc: