osm 0.1.11 → 0.1.12

data/spec/osm/member_spec.rb

@@ -191,6 +191,218 @@ describe "Member" do
       members.size.should == 0
     end
 
+    it "Create in OSM (succeded)" do
+      member = Osm::Member.new(
+        :section_id => 2,
+        :first_name => 'First',
+        :last_name => 'Last',
+        :email1 => 'email1@example.com',
+        :email2 => 'email2@example.com',
+        :email3 => 'email3@example.com',
+        :email4 => 'email4@example.com',
+        :phone1 => '11111 111111',
+        :phone2 => '222222',
+        :phone3 => '+33 3333 333333',
+        :phone4 => '4444 444 444',
+        :address => '1 Some Road',
+        :address2 => 'Address 2',
+        :date_of_birth => '2000-01-02',
+        :started => '2006-01-02',
+        :joined => '2006-01-03',
+        :parents => 'John and Jane Doe',
+        :notes => 'None',
+        :medical => 'Nothing',
+        :religion => 'Unknown',
+        :school => 'Some School',
+        :ethnicity => 'Yes',
+        :subs => 'Upto end of 2007',
+        :custom1 => 'Custom Field 1',
+        :custom2 => 'Custom Field 2',
+        :custom3 => 'Custom Field 3',
+        :custom4 => 'Custom Field 4',
+        :custom5 => 'Custom Field 5',
+        :custom6 => 'Custom Field 6',
+        :custom7 => 'Custom Field 7',
+        :custom8 => 'Custom Field 8',
+        :custom9 => 'Custom Field 9',
+        :grouping_id => '3',
+        :grouping_leader => 0,
+      )
+
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=newMember'
+      post_data = {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'sectionid' => 2,
+        'firstname' => 'First',
+        'lastname' => 'Last',
+        'email1' => 'email1@example.com',
+        'email2' => 'email2@example.com',
+        'email3' => 'email3@example.com',
+        'email4' => 'email4@example.com',
+        'phone1' => '11111 111111',
+        'phone2' => '222222',
+        'phone3' => '+33 3333 333333',
+        'phone4' => '4444 444 444',
+        'address' => '1 Some Road',
+        'address2' => 'Address 2',
+        'dob' => '2000-01-02',
+        'started' => '2006-01-02',
+        'startedsection' => '2006-01-03',
+        'parents' => 'John and Jane Doe',
+        'notes' => 'None',
+        'medical' => 'Nothing',
+        'religion' => 'Unknown',
+        'school' => 'Some School',
+        'ethnicity' => 'Yes',
+        'subs' => 'Upto end of 2007',
+        'custom1' => 'Custom Field 1',
+        'custom2' => 'Custom Field 2',
+        'custom3' => 'Custom Field 3',
+        'custom4' => 'Custom Field 4',
+        'custom5' => 'Custom Field 5',
+        'custom6' => 'Custom Field 6',
+        'custom7' => 'Custom Field 7',
+        'custom8' => 'Custom Field 8',
+        'custom9' => 'Custom Field 9',
+        'patrolid' => 3,
+        'patrolleader' => 0,
+      }
+
+      Osm::Term.stub(:get_for_section) { [] }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":1}'}) }
+      member.create(@api).should be_true
+      member.id.should == 1
+    end
+
+    it "Create in OSM (failed)" do
+      member = Osm::Member.new(
+        :section_id => 2,
+        :first_name => 'First',
+        :last_name => 'Last',
+        :date_of_birth => '2000-01-02',
+        :started => '2006-01-02',
+        :joined => '2006-01-03',
+        :grouping_id => '3',
+        :grouping_leader => 0,
+      )
+
+      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":-1}'}) }
+      member.create(@api).should be_false
+    end
+
+
+    it "Update in OSM (succeded)" do
+      member = Osm::Member.new(
+        :id => 1,
+        :section_id => 2,
+        :first_name => 'First',
+        :last_name => 'Last',
+        :email1 => 'email1@example.com',
+        :email2 => 'email2@example.com',
+        :email3 => 'email3@example.com',
+        :email4 => 'email4@example.com',
+        :phone1 => '11111 111111',
+        :phone2 => '222222',
+        :phone3 => '+33 3333 333333',
+        :phone4 => '4444 444 444',
+        :address => '1 Some Road',
+        :address2 => 'Address 2',
+        :date_of_birth => '2000-01-02',
+        :started => '2006-01-02',
+        :joined => '2006-01-03',
+        :parents => 'John and Jane Doe',
+        :notes => 'None',
+        :medical => 'Nothing',
+        :religion => 'Unknown',
+        :school => 'Some School',
+        :ethnicity => 'Yes',
+        :subs => 'Upto end of 2007',
+        :custom1 => 'Custom Field 1',
+        :custom2 => 'Custom Field 2',
+        :custom3 => 'Custom Field 3',
+        :custom4 => 'Custom Field 4',
+        :custom5 => 'Custom Field 5',
+        :custom6 => 'Custom Field 6',
+        :custom7 => 'Custom Field 7',
+        :custom8 => 'Custom Field 8',
+        :custom9 => 'Custom Field 9',
+        :grouping_id => 3,
+        :grouping_leader => 0,
+      )
+
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=updateMember&dateFormat=generic'
+      body_data = {
+        'firstname' => 'First',
+        'lastname' => 'Last',
+        'email1' => 'email1@example.com',
+        'email2' => 'email2@example.com',
+        'email3' => 'email3@example.com',
+        'email4' => 'email4@example.com',
+        'phone1' => '11111 111111',
+        'phone2' => '222222',
+        'phone3' => '+33 3333 333333',
+        'phone4' => '4444 444 444',
+        'address' => '1 Some Road',
+        'address2' => 'Address 2',
+        'dob' => '2000-01-02',
+        'started' => '2006-01-02',
+        'startedsection' => '2006-01-03',
+        'parents' => 'John and Jane Doe',
+        'notes' => 'None',
+        'medical' => 'Nothing',
+        'religion' => 'Unknown',
+        'school' => 'Some School',
+        'ethnicity' => 'Yes',
+        'subs' => 'Upto end of 2007',
+        'custom1' => 'Custom Field 1',
+        'custom2' => 'Custom Field 2',
+        'custom3' => 'Custom Field 3',
+        'custom4' => 'Custom Field 4',
+        'custom5' => 'Custom Field 5',
+        'custom6' => 'Custom Field 6',
+        'custom7' => 'Custom Field 7',
+        'custom8' => 'Custom Field 8',
+        'custom9' => 'Custom Field 9',
+        'patrolid' => 3,
+        'patrolleader' => 0,
+      }
+      body = (body_data.inject({}) {|h,(k,v)| h[k]=v.to_s; h}).to_json
+
+      body_data.each do |column, value|
+        HTTParty.should_receive(:post).with(url, {:body => {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+          'scoutid' => member.id,
+          'column' => column,
+          'value' => value,
+          'sectionid' => member.section_id,
+        }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+      end
+      member.update(@api).should be_true
+    end
+
+    it "Update in OSM (failed)" do
+      member = Osm::Member.new(
+        :id => 1,
+        :section_id => 2,
+        :first_name => 'First',
+        :last_name => 'Last',
+        :date_of_birth => '2000-01-02',
+        :started => '2006-01-02',
+        :joined => '2006-01-03',
+        :grouping_id => '3',
+        :grouping_leader => 0,
+      )
+
+      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      member.update(@api).should be_false
+    end
+
   end
 
 end

data/spec/osm/section_spec.rb

@@ -29,7 +29,7 @@ describe "Section" do
       :myscout_programme => true,
       :myscout_payments => true,
       :myscout_emails => {:email1 => true, :email2 => false},
-      :myscout_email_address_send => 'send_from@example.com',
+      :myscout_email_address_from => 'send_from@example.com',
       :myscout_email_address_copy => '',
       :myscout_badges_partial => true,
       :myscout_programme_summary => true,
@@ -65,7 +65,7 @@ describe "Section" do
     section.myscout_programme.should == true
     section.myscout_payments.should == true
     section.myscout_emails.should == {:email1 => true, :email2 => false}
-    section.myscout_email_address_send.should == 'send_from@example.com'
+    section.myscout_email_address_from.should == 'send_from@example.com'
     section.myscout_email_address_copy.should == ''
     section.myscout_badges_partial.should == true
     section.myscout_programme_summary.should == true
@@ -88,6 +88,8 @@ describe "Section" do
     section.intouch_fields.should == {}
     section.mobile_fields.should == {}
     section.flexi_records.should == []
+    section.myscout_email_address_from.should == ''
+    section.myscout_email_address_copy.should == ''
   end
 
 
@@ -95,7 +97,7 @@ describe "Section" do
 
     before :each do
       body = [
-        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":\"\",\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
+        {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true},\"gocardless\":\"true\",\"portal\":{\"paymentRemindFrequency\":\"7\",\"paymentRemindCount\":\"6\",\"eventRemindFrequency\":\"5\",\"eventRemindCount\":\"4\",\"badgesPartial\":1,\"programmeSummary\":1,\"emailAddress\":\"send_from@example.com\",\"emailAddressCopy\":null,\"payments\":1,\"badges\":1,\"emails\":{\"email1\":\"true\",\"email2\":\"false\"},\"events\":1,\"programme\":1},\"portalExpires\":{\"events\":\"2013-01-06\",\"eventsA\":1,\"badges\":\"2013-01-07\",\"badgesA\":1,\"programme\":\"2013-01-08\",\"programmeA\":1}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
         {"sectionConfig"=>"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"cubs\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member's Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member's Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}", "groupname"=>"1st Somewhere", "groupid"=>"1", "groupNormalised"=>"1", "sectionid"=>"2", "sectionname"=>"Section 2", "section"=>"cubs", "isDefault"=>"0", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}}
       ]
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json)
@@ -129,7 +131,7 @@ describe "Section" do
       section.myscout_programme.should == true
       section.myscout_payments.should == true
       section.myscout_emails.should == {:email1 => true, :email2 => false}
-      section.myscout_email_address_send.should == 'send_from@example.com'
+      section.myscout_email_address_from.should == 'send_from@example.com'
       section.myscout_email_address_copy.should == ''
       section.myscout_badges_partial.should == true
       section.myscout_programme_summary.should == true

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000Z
+date: 2013-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &79244120 !ruby/object:Gem::Requirement
+  requirement: &84282110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *79244120
+  version_requirements: *84282110
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &79243800 !ruby/object:Gem::Requirement
+  requirement: &84281680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *79243800
+  version_requirements: *84281680
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &79243500 !ruby/object:Gem::Requirement
+  requirement: &84281390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *79243500
+  version_requirements: *84281390
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &79243020 !ruby/object:Gem::Requirement
+  requirement: &84280860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *79243020
+  version_requirements: *84280860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79242470 !ruby/object:Gem::Requirement
+  requirement: &84280240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *79242470
+  version_requirements: *84280240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79242200 !ruby/object:Gem::Requirement
+  requirement: &84279560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *79242200
+  version_requirements: *84279560
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &79241900 !ruby/object:Gem::Requirement
+  requirement: &84279180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *79241900
+  version_requirements: *84279180
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -137,7 +137,7 @@ files:
 - spec/osm/term_spec.rb
 - spec/spec_helper.rb
 - version.rb
-homepage: ''
+homepage: https://github.com/robertgauld/osm
 licenses: []
 post_install_message: 
 rdoc_options: []