copycopter_client 1.1.2 → 2.0.0

data/spec/spec_helper.rb

@@ -6,24 +6,24 @@ require 'webmock/rspec'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-$LOAD_PATH << File.join(PROJECT_ROOT, "lib")
+$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 
-require "copycopter_client"
+require 'copycopter_client'
 
-Dir.glob(File.join(PROJECT_ROOT, "spec", "support", "**", "*.rb")).each do |file|
+Dir.glob(File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')).each do |file|
   require(file)
 end
 
 WebMock.disable_net_connect!
-ShamRack.mount(FakeCopycopterApp.new, "copycopter.com", 443)
+ShamRack.mount FakeCopycopterApp.new, 'copycopter.com', 80
 
 RSpec.configure do |config|
   config.include ClientSpecHelpers
   config.include WebMock::API
   config.mock_with :mocha
+
   config.before do
     FakeCopycopterApp.reset
     reset_config
   end
 end
-

data/spec/support/fake_client.rb

@@ -39,11 +39,15 @@ class FakeClient
   private
 
   def wait_for_delay
-    sleep(delay) if delay
+    if delay
+      sleep delay
+    end
   end
 
   def raise_error_if_present
-    raise error if error
+    if error
+      raise error
+    end
   end
 end
 

data/spec/support/fake_copycopter_app.rb

@@ -12,7 +12,8 @@ class FakeCopycopterApp < Sinatra::Base
       else
         Thin::Logging.silent = true
       end
-      Rack::Handler::Thin.run(self, :Port => port)
+
+      Rack::Handler::Thin.run self, :Port => port
     end
   end
 
@@ -21,7 +22,7 @@ class FakeCopycopterApp < Sinatra::Base
   end
 
   def self.add_project(api_key)
-    Project.create(api_key)
+    Project.create api_key
   end
 
   def self.reset
@@ -29,37 +30,37 @@ class FakeCopycopterApp < Sinatra::Base
   end
 
   def self.project(api_key)
-    Project.find(api_key)
+    Project.find api_key
   end
 
   def with_project(api_key)
     if api_key == 'raise_error'
-      halt 500, { :error => "Blah ha" }.to_json
+      halt 500, { :error => 'Blah ha' }.to_json
     elsif project = Project.find(api_key)
-      yield(project)
+      yield project
     else
-      halt 404, { :error => "No such project" }.to_json
+      halt 404, { :error => 'No such project' }.to_json
     end
   end
 
-  get "/api/v2/projects/:api_key/published_blurbs" do |api_key|
+  get '/api/v2/projects/:api_key/published_blurbs' do |api_key|
     with_project(api_key) do |project|
       etag project.etag
       project.published.to_json
     end
   end
 
-  get "/api/v2/projects/:api_key/draft_blurbs" do |api_key|
+  get '/api/v2/projects/:api_key/draft_blurbs' do |api_key|
     with_project(api_key) do |project|
       etag project.etag
       project.draft.to_json
     end
   end
 
-  post "/api/v2/projects/:api_key/draft_blurbs" do |api_key|
+  post '/api/v2/projects/:api_key/draft_blurbs' do |api_key|
     with_project(api_key) do |project|
       with_json_data do |data|
-        project.update('draft' => data)
+        project.update 'draft' => data
         201
       end
     end
@@ -67,13 +68,13 @@ class FakeCopycopterApp < Sinatra::Base
 
   def with_json_data
     if request.content_type == 'application/json'
-      yield(JSON.parse(request.body.read))
+      yield JSON.parse(request.body.read)
     else
       406
     end
   end
 
-  post "/api/v2/projects/:api_key/deploys" do |api_key|
+  post '/api/v2/projects/:api_key/deploys' do |api_key|
     with_project(api_key) do |project|
       project.deploy
       201
@@ -84,33 +85,41 @@ class FakeCopycopterApp < Sinatra::Base
     attr_reader :draft, :published, :api_key
 
     def initialize(attrs)
-      @api_key   = attrs['api_key']
-      @draft     = attrs['draft']     || {}
+      @api_key = attrs['api_key']
+      @draft = attrs['draft']  || {}
+      @etag = attrs['etag'] || 1
       @published = attrs['published'] || {}
-      @etag      = attrs['etag']      || 1
     end
 
     def to_hash
-      { 'api_key'   => @api_key,
-        'etag'      => @etag,
-        'draft'     => @draft,
-        'published' => @published }
+      {
+        'api_key' => @api_key,
+        'etag' => @etag,
+        'draft' => @draft,
+        'published' => @published
+      }
     end
 
     def update(attrs)
-      @draft.    update(attrs['draft'])     if attrs['draft']
-      @published.update(attrs['published']) if attrs['published']
+      if attrs['draft']
+        @draft.update attrs['draft']
+      end
+
+      if attrs['published']
+        @published.update attrs['published']
+      end
+
       @etag += 1
-      self.class.save(self)
+      self.class.save self
     end
 
     def reload
-      self.class.find(api_key)
+      self.class.find api_key
     end
 
     def deploy
-      @published.update(@draft)
-      self.class.save(self)
+      @published.update @draft
+      self.class.save self
     end
 
     def etag
@@ -119,14 +128,14 @@ class FakeCopycopterApp < Sinatra::Base
 
     def self.create(api_key)
       project = Project.new('api_key' => api_key)
-      save(project)
+      save project
       project
     end
 
     def self.find(api_key)
       open_project_data do |data|
         if project_hash = data[api_key]
-          Project.new(project_hash.dup)
+          Project.new project_hash.dup
         else
           nil
         end
@@ -147,7 +156,8 @@ class FakeCopycopterApp < Sinatra::Base
 
     def self.open_project_data
       project_file = File.expand_path('/../../../tmp/projects.json', __FILE__)
-      if File.exist?(project_file)
+
+      if File.exist? project_file
         data = JSON.parse(IO.read(project_file))
       else
         data = {}
@@ -155,10 +165,11 @@ class FakeCopycopterApp < Sinatra::Base
 
       result = yield(data)
 
-      File.open(project_file, "w") { |file| file.write(data.to_json) }
+      File.open(project_file, 'w') do |file|
+        file.write data.to_json
+      end
 
       result
     end
   end
 end
-

metadata

@@ -1,274 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: copycopter_client
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70204562771880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70204562771880
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70204562770040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70204562770040
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70204562768960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70204562768960
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70204562767460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70204562767460
+- !ruby/object:Gem::Dependency
+  name: bourne
+  requirement: &70204562785260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bourne
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70204562785260
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70204574966100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70204574966100
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70204575028840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575028840
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70204575024560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575024560
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70204575079300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575079300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70204575077840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575077840
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: &70204575077260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575077260
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70204575076360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575076360
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &70204575075680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575075680
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70204575075060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575075060
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70204575074380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *70204575074380
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70204575073640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
+  prerelease: false
+  version_requirements: *70204575073640
 description: 
 email: support@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .bundle/config
+files:
 - .gitignore
 - .rspec
-- AddTrustExternalCARoot.crt
+- .travis.yml
 - Appraisals
-- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -323,41 +251,37 @@ files:
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
 - tmp/projects.json
-has_rdoc: true
-homepage: http://github.com/thoughtbot/copycopter_client
+homepage: http://github.com/copycopter/copycopter-ruby-client
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1148726401025819001
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1148726401025819001
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Client for the Copycopter content management service
-test_files: 
+summary: Client for the Copycopter copy management service
+test_files:
 - features/rails.feature
 - features/step_definitions/copycopter_server_steps.rb
 - features/step_definitions/rails_steps.rb