wistia-api 0.2.1 → 0.2.2

data/spec/wistia/projects/sharing_spec.rb

@@ -1,17 +1,20 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-module Wistia
-  module Projects
-    describe Sharing do
-      describe 'refresh_config!' do
-        it 'overrides the site value to indicate nesting under projects' do
-          api_url = Wistia::Config.config.api.url
-          Wistia::Projects::Sharing.should_receive(:site=).with(api_url).ordered
-
-          Wistia::Projects::Sharing.should_receive(:site=).with("#{api_url}projects/:project_id/").ordered
-          Wistia::Projects::Sharing.refresh_config!
-        end
-      end
+describe Wistia::Projects::Sharing do
+  describe '#find' do
+    it 'finds the sharing under the project' do
+      FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/projects/3/sharings/7.json', body: {name: 'sharing name'}.to_json
+      Wistia.password = 'foo'
+      Wistia.format = :json
+      Wistia::Projects::Sharing.find(7, params:{project_id: 3}).name.should == 'sharing name'
+    end
+  end
+  describe '#to_json' do
+    it 'renders attributes in json format' do
+      b = Wistia::Projects::Sharing.new
+      b.key1 = 'val1'
+      b.key2 = 'val2'
+      JSON.parse(b.to_json).should == {'key1' => 'val1', 'key2' => 'val2'}
     end
   end
 end

data/spec/wistia/stats_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Wistia::Stats::Event do
+  it 'finds the event' do
+    FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/stats/events/7.json', body: {name: 'object name'}.to_json
+    Wistia.password = 'foo'
+    Wistia.format = :json
+    Wistia::Stats::Event.find(7).name.should == 'object name'
+  end
+end
+describe Wistia::Stats::Media do
+  it 'finds the media' do
+    FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/stats/medias/7.json', body: {name: 'object name'}.to_json
+    Wistia.password = 'foo'
+    Wistia.format = :json
+    Wistia::Stats::Media.find(7).name.should == 'object name'
+  end
+end
+describe Wistia::Stats::Project do
+  it 'finds the project' do
+    FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/stats/projects/7.json', body: {name: 'object name'}.to_json
+    Wistia.password = 'foo'
+    Wistia.format = :json
+    Wistia::Stats::Project.find(7).name.should == 'object name'
+  end
+end
+describe Wistia::Stats::Visitor do
+  it 'finds the visitor' do
+    FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/stats/visitors/7.json', body: {name: 'object name'}.to_json
+    Wistia.password = 'foo'
+    Wistia.format = :json
+    Wistia::Stats::Visitor.find(7).name.should == 'object name'
+  end
+end
+describe Wistia::Stats::Account do
+  describe '#find_singleton' do
+    it 'finds the account' do
+      FakeWeb.register_uri :get, 'https://api:foo@api.wistia.com/v1/stats/account.json', body: {name: 'account name'}.to_json
+      Wistia.password = 'foo'
+      Wistia.format = :json
+      Wistia::Stats::Account.find_singleton.name.should == 'account name'
+    end
+  end
+end

data/wistia-api.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "wistia-api"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jim Bancroft", "Mark Bates"]
-  s.date = "2012-12-12"
+  s.authors = ["Jeff Vincent", "Jim Bancroft", "Mark Bates", "Robby Grossman"]
+  s.date = "2013-02-27"
   s.description = "A ruby library for working with Wistia's data API."
   s.email = "support@wistia.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -23,76 +23,58 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
-    "lib/config.rb",
     "lib/wistia.rb",
     "lib/wistia/base.rb",
     "lib/wistia/config.rb",
+    "lib/wistia/initialization.rb",
     "lib/wistia/media.rb",
     "lib/wistia/project.rb",
     "lib/wistia/projects/sharing.rb",
-    "lib/wistia/stats/account.rb",
-    "lib/wistia/stats/base.rb",
-    "lib/wistia/stats/event.rb",
-    "lib/wistia/stats/media.rb",
-    "lib/wistia/stats/project.rb",
-    "lib/wistia/stats/visitor.rb",
+    "lib/wistia/stats.rb",
     "spec/spec_helper.rb",
     "spec/support/config.test.yml",
-    "spec/support/local_config.rb",
     "spec/wistia/base_spec.rb",
+    "spec/wistia/config_spec.rb",
+    "spec/wistia/media_spec.rb",
+    "spec/wistia/project_spec.rb",
     "spec/wistia/projects/sharing_spec.rb",
-    "spec/wistia/stats/base_spec.rb",
-    "spec/wistia_spec.rb",
+    "spec/wistia/stats_spec.rb",
     "wistia-api.gemspec"
   ]
   s.homepage = "http://github.com/wistia/wistia-api"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Ruby wrapper for Wistia's API"
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/support/local_config.rb",
-    "spec/wistia/base_spec.rb",
-    "spec/wistia/projects/sharing_spec.rb",
-    "spec/wistia/stats/base_spec.rb",
-    "spec/wistia_spec.rb"
-  ]
 
   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<activeresource>, [">= 2.3.8"])
-      s.add_runtime_dependency(%q<configatron>, [">= 2.6.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2"])
+      s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<activeresource>, [">= 2.3.8"])
-      s.add_runtime_dependency(%q<configatron>, [">= 2.6.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12"])
     else
       s.add_dependency(%q<activeresource>, [">= 2.3.8"])
-      s.add_dependency(%q<configatron>, [">= 2.6.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.2"])
+      s.add_dependency(%q<fakeweb>, ["~> 1.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<activeresource>, [">= 2.3.8"])
-      s.add_dependency(%q<configatron>, [">= 2.6.4"])
+      s.add_dependency(%q<rspec>, ["~> 2.12"])
     end
   else
     s.add_dependency(%q<activeresource>, [">= 2.3.8"])
-    s.add_dependency(%q<configatron>, [">= 2.6.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.2"])
+    s.add_dependency(%q<fakeweb>, ["~> 1.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<activeresource>, [">= 2.3.8"])
-    s.add_dependency(%q<configatron>, [">= 2.6.4"])
+    s.add_dependency(%q<rspec>, ["~> 2.12"])
   end
 end
 

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: wistia-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
+- Jeff Vincent
 - Jim Bancroft
 - Mark Bates
+- Robby Grossman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -29,29 +31,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.8
 - !ruby/object:Gem::Dependency
-  name: configatron
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +45,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +61,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +69,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +77,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
@@ -109,44 +95,28 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activeresource
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.8
-- !ruby/object:Gem::Dependency
-  name: configatron
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.4
-  type: :runtime
+        version: '2.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: '2.12'
 description: A ruby library for working with Wistia's data API.
 email: support@wistia.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .rspec
@@ -154,29 +124,25 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
-- lib/config.rb
 - lib/wistia.rb
 - lib/wistia/base.rb
 - lib/wistia/config.rb
+- lib/wistia/initialization.rb
 - lib/wistia/media.rb
 - lib/wistia/project.rb
 - lib/wistia/projects/sharing.rb
-- lib/wistia/stats/account.rb
-- lib/wistia/stats/base.rb
-- lib/wistia/stats/event.rb
-- lib/wistia/stats/media.rb
-- lib/wistia/stats/project.rb
-- lib/wistia/stats/visitor.rb
+- lib/wistia/stats.rb
 - spec/spec_helper.rb
 - spec/support/config.test.yml
-- spec/support/local_config.rb
 - spec/wistia/base_spec.rb
+- spec/wistia/config_spec.rb
+- spec/wistia/media_spec.rb
+- spec/wistia/project_spec.rb
 - spec/wistia/projects/sharing_spec.rb
-- spec/wistia/stats/base_spec.rb
-- spec/wistia_spec.rb
+- spec/wistia/stats_spec.rb
 - wistia-api.gemspec
 homepage: http://github.com/wistia/wistia-api
 licenses:
@@ -193,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 76556245729563149
+      hash: 3016534490162460679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,14 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for Wistia's API
-test_files:
-- spec/spec_helper.rb
-- spec/support/local_config.rb
-- spec/wistia/base_spec.rb
-- spec/wistia/projects/sharing_spec.rb
-- spec/wistia/stats/base_spec.rb
-- spec/wistia_spec.rb
+test_files: []

data/README.rdoc

@@ -1,71 +0,0 @@
-= wistia-api
-
-Ruby wrapper for Wistia's API
-
-== Installation
-
-Required gems:
-* activeresource >= 2.3.8
-* configatron >= 2.6.4
-
-Install:
-  gem install wistia-api
-
-RDoc[http://rubydoc.info/gems/wistia-api/frames]
-
-== Basic Usage
-
-Start by requiring wistia:
-  require 'wistia'
-
-Configure your API password:
-  Wistia.password = 'your-api-key-here'
-
-You can get an API password by following the instructions here: http://wistia.com/doc/data-api#getting_started
-
-Now you can use the <tt>Wistia::Media</tt>, <tt>Wistia::Project</tt>, and <tt>Wistia::Projects::Sharing</tt> classes as ActiveResource wrappers around Wistia's API.
-
-See http://wistia.com/doc/data-api for more info.
-
-== Configuration Options
-
-Set the format of the API:
-  Wistia.format = 'json'  # This is the default.
-  Wistia.format = 'xml'
-
-Read configuration from an external YAML file:
-  Wistia.use_config!(path_to_yaml)
-
-For an example YAML config, see spec/support/config.local.yml
-
-Configure using a Hash:
-  Wistia.use_config!(:wistia => {
-    :api => {
-      :url => 'custom-api-url',
-      :user => 'custom-api-user',
-      :password => 'your-api-password',
-      :format => 'xml-or-json'
-    }
-  })
-
-== Examples
-
-List all Media in your account:
-  Wistia::Media.find(:all)
-
-List all Projects in your account:
-  Wistia::Project.find(:all)
-
-List all Sharing objects for project 23:
-  Wistia::Projects::Sharing.find(:all, :params => { :project_id => 23 })
-
-Get stats for a project since the December 1, 2012
-  Wistia::Stats::Project.get('efjh6kxmc9/by_date', :start_date => '2012-12-01')
-
-List Overall Stats for Your Account
-  Wistia::Stats::Account.find_singleton
-
-== Copyright
-
-Copyright (c) 2011 Wistia, Inc. See LICENSE.txt for
-further details.

data/lib/config.rb

@@ -1,24 +0,0 @@
-# Workaround for a problem with configatron in JRuby 1.7+
-# Contributors have suggested a solution at
-# https://github.com/markbates/configatron/pull/33
-# but the patch has not been applied for months
-
-def running_jruby_1_7_or_later
-  RUBY_PLATFORM == 'java' && !JRUBY_VERSION.match(/[0-1]\.[0-6]/)
-end
-
-if running_jruby_1_7_or_later && !defined? Psych::Yecht
-  module Psych
-    module Yecht
-      MergeKey = Psych::Syck
-    end
-  end
-end
-
-require 'configatron'
-
-configatron.wistia.api.key = ''
-configatron.wistia.api.user = 'api'
-configatron.wistia.api.format = :json
-configatron.wistia.api.url = 'https://api.wistia.com/v1/'
-

data/lib/wistia/stats/account.rb

@@ -1,12 +0,0 @@
-module Wistia
-  module Stats
-    class Account < Wistia::Stats::Base
-
-      # to make it easier to find singleton
-      def self.find_singleton
-        find :one, :from => '/v1/stats/account.json'
-      end
-
-    end
-  end
-end

data/lib/wistia/stats/base.rb

@@ -1,14 +0,0 @@
-module Wistia
-  module Stats
-    class Base < Wistia::Base
-
-      # we needs to use the stats url
-      def self.refresh_config!
-        super
-        self.site = "#{Wistia::Config.config.api.url}stats/"
-      end
-      refresh_config!
-
-    end
-  end
-end

data/lib/wistia/stats/event.rb

@@ -1,7 +0,0 @@
-module Wistia
-  module Stats
-    class Event < Wistia::Stats::Base
-
-    end
-  end
-end

data/lib/wistia/stats/media.rb

@@ -1,7 +0,0 @@
-module Wistia
-  module Stats
-    class Media < Wistia::Stats::Base
-
-    end
-  end
-end

data/lib/wistia/stats/project.rb

@@ -1,7 +0,0 @@
-module Wistia
-  module Stats
-    class Project < Wistia::Stats::Base
-
-    end
-  end
-end

data/lib/wistia/stats/visitor.rb

@@ -1,7 +0,0 @@
-module Wistia
-  module Stats
-    class Visitor < Wistia::Stats::Base
-
-    end
-  end
-end

data/spec/support/local_config.rb

@@ -1,5 +0,0 @@
-configatron.wistia.api.key = 'test'
-configatron.wistia.api.user = 'api'
-configatron.wistia.api.format = :json
-configatron.wistia.api.url = 'http://api.wistia.local:3000/v1/'
-configatron.wistia.api.projects.url = 'http://api.wistia.local:3000/v1/projects'

data/spec/wistia/stats/base_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-module Wistia
-  module Stats
-    describe Base do
-      describe 'refresh_config!' do
-        it 'overrides the site value to indicate namespacing under stats' do
-          api_url = Wistia::Config.config.api.url
-          Wistia::Stats::Base.should_receive(:site=).with(api_url).ordered
-
-          Wistia::Stats::Base.should_receive(:site=).with("#{api_url}stats/").ordered
-          Wistia::Stats::Base.refresh_config!
-        end
-      end
-    end
-  end
-end

data/spec/wistia_spec.rb

@@ -1,80 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Wistia do
-
-  describe 'use_config!' do
-    context 'given a hash argument' do
-      it 'uses the hash to configure configatron' do
-        Wistia.use_config!( :wistia => { :api => { :key => 'test' } } )
-        configatron.wistia.api.key.should == 'test'
-      end
-    end
-
-    context 'given a path to a yaml file' do
-      it 'makes configatron use the yaml file for configuration' do
-        path_to_yaml = File.dirname(__FILE__) + '/support/config.test.yml'
-        configatron.should_receive(:configure_from_yaml).with(path_to_yaml)
-        Wistia.use_config!(path_to_yaml)
-      end
-    end
-
-    context 'given an invalid config' do
-      it 'raises an ArgumentError' do
-        lambda {
-          Wistia.use_config!(nil)
-        }.should raise_error(ArgumentError, 'Invalid config')
-      end
-    end
-
-    it 'uses the new configuration' do
-      Wistia.should_receive(:refresh_config!)
-      Wistia.use_config!( :wistia => { :api => { :key => 'test' } } )
-    end
-  end
-
-  describe 'password=' do
-    it 'reconfigures the API using the new password parameter' do
-      new_password = 'test'
-      Wistia.password = new_password
-      Wistia.should_receive(:use_config!).with(hash_including(:wistia => { :api => { :key => new_password } }))
-      Wistia.password = new_password
-    end
-  end
-
-  describe 'format=' do
-    context 'given a valid format' do
-      it 'reconfigures the API using the new format parameter' do
-        new_format = :xml
-        Wistia.should_receive(:use_config!).with(hash_including(:wistia => { :api => { :format => new_format } }))
-        Wistia.format = new_format
-      end
-    end
-
-    context 'given an invalid format' do
-      it 'raises an ArgumentError' do
-        lambda {
-          Wistia.format = 'invalid_format'
-        }.should raise_error(ArgumentError, /Invalid format/)
-      end
-    end
-  end
-
-  describe 'refresh_config!' do
-    it 'forces Wistia::Media to re-read its configuration from the configatron' do
-      Wistia::Media.should_receive(:refresh_config!)
-      Wistia.refresh_config!
-    end
-
-    it 'forces Wistia::Project to re-read its configuration from the configatron' do
-      Wistia::Project.should_receive(:refresh_config!)
-      Wistia.refresh_config!
-    end
-
-    it 'forces Wistia::Projects::Sharing to re-read its configuration from the configatron' do
-      Wistia::Projects::Sharing.should_receive(:refresh_config!)
-      Wistia.refresh_config!
-    end
-  end
-  
-end
-