tpdata 1.1.0 → 1.1.5

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+
+bundler_args: --without coverage
+rvm:
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head

data/Gemfile

@@ -1,2 +1,17 @@
+RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 source :rubygems
 gemspec
+
+gem 'rake'
+gem 'rspec'
+gem 'webmock'
+gem 'yard'
+
+group :coverage do
+  gem 'simplecov'
+  gem 'simplecov-rcov'
+end
+
+if RUBY_ENGINE == 'jruby'
+  gem 'jruby-openssl'
+end

data/README.md

@@ -101,13 +101,13 @@ A DELETE:
 
     media.delete('Media','27550715', schema:'1.4.0',form:'cjson',token:'Nez8Y9ScVDxPxLDmUsg_ESCDYJCJwPBk',account:'My_Account')
 
-Needed params here are the Object, Object ID(s), schema, form, token, and account.
+Needed params here are the Object, Object ID(s), schema, form, token, and account.  To specify no ID, pass 'none' as the parameter.
 
 Notify:
 
 The Notify endpoint is supported as well.
 
-    media.notify(token:'Nez8Y9ScVDxPxLDmUsg_ESCDYJCJwPBk', size:'10', since:'11111111')
+    media.notify(size:'10', since:'11111111')
 
 
 ## LICENSE:

data/Rakefile

@@ -1,13 +1,12 @@
-# -*- ruby -*-
-
 require 'rspec/core/rake_task'
 
-desc "Run specs"
-RSpec::Core::RakeTask.new(:spec)
-
 task default: :spec
 
-task :coverage do |t|
+desc "Run Specs"
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Build Spec Coverage"
+task :coverage do
   ENV["COVERAGE"] = 'true'
   Rake::Task[:spec].execute
 end

data/lib/theplatform/data.rb

@@ -12,15 +12,22 @@ module ThePlatform
       @objects  = params[:objects]
     end
 
+    # List the available services to build objects with
+    def self.services
+      service = []
+      ThePlatform.const_get(:SERVICE).keys.each { |k| service << k }
+      service
+    end
+
     # Set the different available params to configure
     def self.keys
       @keys ||= [:schema, :form, :token]
     end
 
     # MetaMagic to initialize SERVICE hash into methods to create SERVICE objects
-    (class << self; self; end).instance_eval do
+    class_eval do
       SERVICE.keys.each do |data|
-        define_method(data) { self.new(endpoint: SERVICE[data][:endpoint], objects: SERVICE[data][:objects]) }
+        define_singleton_method(data) { self.new(endpoint: SERVICE[data][:endpoint], objects: SERVICE[data][:objects]) }
       end
     end
 
@@ -73,7 +80,8 @@ module ThePlatform
 
     # DELETE objects
     #
-    # To DELETE Objects, pass the Object type and comma separated IDs
+    # To DELETE Objects, pass the Object type and comma separated IDs, or specify 'none' for ID if DELETE'ing
+    # via query.
     #
     # Needed parameters: schema, form, token, and account
     #
@@ -81,7 +89,9 @@ module ThePlatform
     #      token:'Nez8Y9ScVDxPxLDmUsg_ESCDYJCJwPBk',account:'Ruby Test Account')
     def delete(object,id=[],options={})
       set_uri
-      self.class.delete("/#{object}/#{id}", query: extras.merge(options))
+      set_header options
+      set_id = "/#{id}" unless id =~ /none/i
+      self.class.delete("/#{object}#{set_id}", query: extras.merge(options))
     end
 
     # NOTIFY endpoint
@@ -92,8 +102,9 @@ module ThePlatform
     #
     #    ThePlatform::Data.mds.notify(token:'G1yP1Zsp7nEHW2fug6glIQCjfjIIIl', size:'10', since:'289334341')
     def notify(options={})
+      set_header options
       self.class.base_uri @endpoint
-      self.class.get("/notify", query: options)
+      self.class.get("/notify", query: extras.merge(options))
     end
 
     private

data/lib/theplatform/identity.rb

@@ -16,7 +16,7 @@ module ThePlatform
 
       # Return ALL THE TOKEN!
       #
-      # ThePlatform::Identity.token(username:'USERNAME', password:'PASSWORD', schema:'1.0', form:'(json|xml|rss)')
+      # ThePlatform::Identity.token(username:'USERNAME', password:'PASSWORD', schema:'1.0', form:'(json|xml)')
       #
       # _duration: and _idleTimeout: are optional.  Resorts to thePlatform defaults if not defined
       def token(options = {})
@@ -26,7 +26,7 @@ module ThePlatform
 
       # Invalidate a given Token
       #
-      # ThePlatform::Identity.invalidate!(token, schema:'1.0', form:'(json|xml|rss)')
+      # ThePlatform::Identity.invalidate!(token, schema:'1.0', form:'(json|xml)')
       def invalidate!(tokens, options = {})
         base_uri IDENTITY
         get("/signOut?_token=#{tokens}", query: extras.merge(options))
@@ -34,7 +34,7 @@ module ThePlatform
 
       # Return the number of tokens in an account.
       #
-      # ThePlatform::Identity.count(username:'USERNAME', password:'PASSWORD',schema:'1.0', form:'(json|xml|rss)')
+      # ThePlatform::Identity.count(username:'USERNAME', password:'PASSWORD',schema:'1.0', form:'(json|xml)')
       def count(options = {})
         base_uri IDENTITY
         get("/getTokenCount", query: extras.merge(options))

data/spec/lib/data_spec.rb

@@ -10,6 +10,14 @@ describe ThePlatform::Data do
 
   end
 
+  describe 'services' do
+
+    it 'should return available services to call' do
+      ThePlatform::Data.services.should == ThePlatform.const_get(:SERVICE).keys
+    end
+
+  end
+
   describe 'endpoints' do
 
     it 'should make for new class methods' do

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rspec'
 require 'webmock/rspec'
-require 'json'
 
 RSpec.configure do |config|
   config.order = 'random'
@@ -9,17 +8,12 @@ end
 
 if ENV["COVERAGE"] == 'true'
   require 'simplecov'
-
-  # add legacy rcov output (so Jenkins/Sonor play well)
   require 'simplecov-rcov'
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-       SimpleCov::Formatter::HTMLFormatter.new.format(result)
-       SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
 
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::RcovFormatter
+  ]
   SimpleCov.start
 end
 

data/theplatform.gemspec

@@ -3,14 +3,14 @@ version = File.read(File.expand_path("../tpdata_version",__FILE__)).strip
 Gem::Specification.new do |s|
   s.name             = 'tpdata'
   s.version          = version
-  s.date             = '2012-10-03'
-  s.authors          = ['Ben Woodall, Bryan Stenson']
+
+  s.summary          = "RESTful wrapper for thePlatform"
+  s.description      = "Tpdata gem is a wrapper for the RESTful interface for thePlatform for Media's Data Services."
+
+  s.authors          = ["Ben Woodall","Bryan Stenson"]
   s.email            = 'mail@benwoodall.com'
   s.homepage         = 'http://github.com/benwoody/tpdata'
 
-  s.summary          = %q{RESTful wrapper for thePlatform}
-  s.description      = %q{Tpdata gem is a wrapper for the RESTful interface for thePlatform for Media's Data Services.}
-
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths    = ["lib"]
@@ -18,11 +18,5 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
 
   s.add_dependency 'httparty', "~> 0.9.0"
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'simplecov-rcov'
 
 end

data/tpdata_version

@@ -1 +1 @@
-1.1.0
+1.1.5

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: tpdata
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
-- Ben Woodall, Bryan Stenson
+- Ben Woodall
+- Bryan Stenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &84022590 !ruby/object:Gem::Requirement
+  requirement: &88048550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,73 +22,7 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *84022590
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &84022240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84022240
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &84021660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84021660
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &84021210 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84021210
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &84020820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84020820
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &84044910 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84044910
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: &84043620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *84043620
+  version_requirements: *88048550
 description: Tpdata gem is a wrapper for the RESTful interface for thePlatform for
   Media's Data Services.
 email: mail@benwoodall.com
@@ -97,6 +32,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Manifest.txt
 - README.md