copycopter_client 1.0.4 → 1.1.0

data/Rakefile

@@ -3,8 +3,7 @@ require 'bundler/setup'
 require 'appraisal'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'yard'
@@ -31,7 +30,7 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 eval("$specification = begin; #{IO.read('copycopter_client.gemspec')}; end")
-Rake::GemPackageTask.new($specification) do |package|
+Gem::PackageTask.new($specification) do |package|
   package.need_zip = true
   package.need_tar = true
 end

data/features/step_definitions/rails_steps.rb

@@ -1,11 +1,17 @@
 When "I generate a rails application" do
   if Rails::VERSION::MAJOR == 3
     subcommand = 'new'
+    if Rails::VERSION::MINOR == 0
+      options = ''
+    else
+      options = '--skip-bundle'
+    end
   else
     subcommand = ''
+    options = ''
   end
 
-  run_simple("rails _#{Rails::VERSION::STRING}_ #{subcommand} testapp")
+  run_simple("rails _#{Rails::VERSION::STRING}_ #{subcommand} testapp #{options}")
   cd("testapp")
 
   if Rails::VERSION::MAJOR == 3
@@ -15,6 +21,8 @@ When "I generate a rails application" do
       gem "sinatra"
       gem "json"
     GEMS
+
+    When %{I remove lines containing "rjs" from "config/environments/development.rb"}
   end
 end
 
@@ -142,6 +150,22 @@ When /^I run a short lived process that sets the key "([^"]*)" to "([^"]*)"$/ do
   end
 end
 
+When /^I remove lines containing "([^"]*)" from "([^"]*)"$/ do |content, filename|
+  in_current_dir do
+    result = ""
+    File.open(filename, "r") do |file|
+      file.each_line do |line|
+        result << line unless line.include?(content)
+      end
+    end
+
+    File.open(filename, "w") do |file|
+      file.write(result)
+    end
+  end
+end
+
+
 After do
   RailsServer.stop
 end

data/lib/copycopter_client/client.rb

@@ -61,7 +61,7 @@ module CopycopterClient
     # @raise [ConnectionError] if the connection fails
     def upload(data)
       connect do |http|
-        response = http.post(uri("draft_blurbs"), data.to_json)
+        response = http.post(uri("draft_blurbs"), data.to_json, 'Content-Type' => 'application/json')
         check(response)
         log("Uploaded missing translations")
       end

data/lib/copycopter_client/version.rb

@@ -1,6 +1,6 @@
 module CopycopterClient
   # Client version
-  VERSION = "1.0.4".freeze
+  VERSION = "1.1.0"
 
   # API version being used to communicate with the server
   API_VERSION = "2.0".freeze

data/spec/copycopter_client/i18n_backend_spec.rb

@@ -60,7 +60,7 @@ describe CopycopterClient::I18nBackend do
 
   it "queues missing keys without default" do
     expect { subject.translate('en', 'test.key') }.
-      to raise_error(I18n::MissingTranslationData)
+      to throw_symbol(:exception)
 
     cache['en.test.key'].should == ""
   end

data/spec/support/fake_copycopter_app.rb

@@ -3,9 +3,15 @@ require 'json'
 require 'thin'
 
 class FakeCopycopterApp < Sinatra::Base
+  disable :show_exceptions
+
   def self.start
     Thread.new do
-      Thin::Logging.silent = true
+      if ENV['DEBUG']
+        Thin::Logging.debug = true
+      else
+        Thin::Logging.silent = true
+      end
       Rack::Handler::Thin.run(self, :Port => port)
     end
   end
@@ -52,9 +58,18 @@ class FakeCopycopterApp < Sinatra::Base
 
   post "/api/v2/projects/:api_key/draft_blurbs" do |api_key|
     with_project(api_key) do |project|
-      data = JSON.parse(request.body.read)
-      project.update('draft' => data)
-      201
+      with_json_data do |data|
+        project.update('draft' => data)
+        201
+      end
+    end
+  end
+
+  def with_json_data
+    if request.content_type == 'application/json'
+      yield(JSON.parse(request.body.read))
+    else
+      406
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - thoughtbot
@@ -15,13 +15,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-09 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -32,8 +34,8 @@ dependencies:
   version_requirements: *id001
   name: i18n
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,7 +48,6 @@ dependencies:
   version_requirements: *id002
   name: json
   prerelease: false
-  type: :runtime
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -101,6 +102,7 @@ files:
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
 - features/support/rails_server.rb
+has_rdoc: true
 homepage: http://github.com/thoughtbot/copycopter_client
 licenses: []
 
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copycopter_client
-rubygems_version: 1.8.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Client for the Copycopter content management service