apiaryio 0.2.4 → 0.2.5

data/README.md

@@ -57,7 +57,7 @@ look in how to use this tool.
 
 ## Copyright
 
-Copyright 2012-14 (c) Apiary Ltd.
+Copyright 2012-15 (c) Apiary Ltd.
 
 ## Contributors
 

data/Rakefile

@@ -10,6 +10,7 @@ rescue LoadError
       puts "Cannot load bundler/gem_tasks"
 end
 
+desc "Run all features"
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
@@ -17,6 +18,7 @@ end
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = true
+  t.rspec_opts = "-fd"
 end
 
 desc 'Default: Run all specs.'

data/apiary.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "json", "~> 1.8.1"
 
-  gem.add_development_dependency "rspec", "~> 3.1.0"
+  gem.add_development_dependency "rspec", "~> 3.2.0"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "yard"
   gem.add_development_dependency "aruba"

data/features/fixtures/apiary_with_bom.apib

@@ -0,0 +1,48 @@
+FORMAT: 1A
+
+# Apiary Client Test - DON'T CHANGE DOCUMENT!
+
+This document is used for testing apiary-client
+
+# Group Notes
+Notes related resources of the **Notes API**
+
+## Notes Collection [/notes
+### List all Notes [GET]
++ Response 200 (application/json)
+
+        [{
+          "id": 1, "title": "Jogging in park"
+        }, {
+          "id": 2, "title": "Pick-up posters from post-office"
+        }]
+
+### Create a Note [POST
+
++ Request
+
+sflmvs;mv;dsm{ "title": "Buy cheese and bread for breakfast." }
+
++ Response 201 (application/json)
+
+        { "id": 3, "title": "Buy cheese and bread for breakfast." }
+
+## Note [/notes/{id}]
+A single Note object with all its details
+
++ Parameters
+    + id (required, number, `1`) ... Numeric `id` of the Note to perform action with. Has example value.
+
+### Retrieve a Note [GET]
++ Response 200 (application/json)
+
+    + Header
+
+            X-My-Header: The Value
+
+    + Body
+
+            { "id": 2, "title": "Pick-up posters from post-office" }
+
+### Remove a Note [DELETE]
++ Response 204

data/lib/apiary/command/fetch.rb

@@ -16,7 +16,6 @@ module Apiary
         @options = OpenStruct.new(opts)
         @options.path         ||= "apiary.apib"
         @options.api_host     ||= "api.apiary.io"
-        @options.port         ||= 8080
         @options.api_name     ||= false
         @options.api_key      ||= ENV['APIARY_API_KEY']
         @options.proxy        ||= ENV['http_proxy']

data/lib/apiary/command/publish.rb

@@ -16,7 +16,6 @@ module Apiary
         @options = OpenStruct.new(opts)
         @options.path           ||= "apiary.apib"
         @options.api_host       ||= "api.apiary.io"
-        @options.port           ||= 8080
         @options.api_name       ||= false
         @options.api_key        ||= ENV['APIARY_API_KEY']
         @options.proxy          ||= ENV['http_proxy']
@@ -50,6 +49,11 @@ module Apiary
         common.validate_apib_file(apib_file)
       end
 
+      def get_apib_file(apib_file)
+        common = Apiary::Common.new
+        common.get_apib_file(apib_file)
+      end
+
       def path
         @options.path || "#{File.basename(Dir.pwd)}.apib"
       end
@@ -58,7 +62,7 @@ module Apiary
         url  = "https://#{host}/blueprint/publish/#{@options.api_name}"
         if validate_apib_file path
           data = {
-            :code => File.read(path),
+            :code => get_apib_file(path),
             :messageToSave => @options.commit_message
           }
           RestClient.proxy = @options.proxy

data/lib/apiary/common.rb

@@ -9,12 +9,21 @@ module Apiary
       def initialize()
       end
 
+      def get_apib_file(apib_file)
+        if validate_apib_file(apib_file)
+          text_without_bom = nil
+          File.open(apib_file, "r:bom|utf-8") { |file|
+            text_without_bom = file.read
+          }
+          text_without_bom
+        end
+      end
+
       def validate_apib_file(apib_file)
         unless File.exist?(apib_file)
           raise "Apiary definition file hasn't been found: #{apib_file.inspect}"
         end
-        File.read(apib_file)
+        true
       end
-
     end
 end

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/common_spec.rb

@@ -16,4 +16,14 @@ describe Apiary::Common do
 
   end
 
+  describe 'Test get file with and without BOM' do
+
+    it 'get file and compare' do
+      common = Apiary::Common.new
+      file1 = common.get_apib_file('features/fixtures/apiary.apib')
+      file2 = common.get_apib_file('features/fixtures/apiary_with_bom.apib')
+      expect(file1).to eq(file2)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiaryio
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,7 @@ files:
 - features/fetch.feature
 - features/fixtures/apiary-invalid.apib
 - features/fixtures/apiary.apib
+- features/fixtures/apiary_with_bom.apib
 - features/preview.feature
 - features/publish.feature
 - features/step_definitions/file_content_step.rb
@@ -231,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3863851522074434890
+      hash: -821896092872960155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3863851522074434890
+      hash: -821896092872960155
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -251,6 +252,7 @@ test_files:
 - features/fetch.feature
 - features/fixtures/apiary-invalid.apib
 - features/fixtures/apiary.apib
+- features/fixtures/apiary_with_bom.apib
 - features/preview.feature
 - features/publish.feature
 - features/step_definitions/file_content_step.rb