github_api 0.3.7 → 0.3.8

data/lib/github_api/api.rb

@@ -119,7 +119,24 @@ module Github
     end
 
     def _filter_params_keys(keys, params)  # :nodoc:
-      params.reject! { |k,v| !keys.include? k }
+      # params.reject! { |k,v| !keys.include? k }
+      case params
+      when Hash
+        params.keys.each do |k, v|
+          unless keys.include? k
+            params.delete(k)
+          else
+            _filter_params_keys(keys, params[k])
+          end
+        end
+      when Array
+        params.map! do |el|
+          _filter_params_keys(keys, el)
+        end
+      else
+        params
+      end
+      return params
     end
 
     def _hash_traverse(hash, &block)

data/lib/github_api/git_data/blobs.rb

@@ -19,10 +19,11 @@ module Github
         _update_user_repo_params(user_name, repo_name)
         _validate_user_repo_params(user, repo) unless user? && repo?
         _validate_presence_of sha
-        _normalize_params_keys(params)
+        _normalize_params_keys params
 
         get("/repos/#{user}/#{repo}/git/blobs/#{sha}", params)
       end
+      alias :get_blob :blob
 
       # Create a blob
       #
@@ -35,9 +36,10 @@ module Github
       #    "content" => "Content of the blob",
       #    "encoding" => "utf-8"
       #
-      def create_blob(user_name, repo_name=nil, params={})
+      def create_blob(user_name, repo_name, params={})
         _update_user_repo_params(user_name, repo_name)
         _validate_user_repo_params(user, repo) unless user? && repo?
+
         _normalize_params_keys(params)
         _filter_params_keys(VALID_BLOB_PARAM_NAMES, params)
 

data/lib/github_api/git_data/trees.rb

@@ -12,6 +12,7 @@ module Github
         type
         sha
         content
+        url
       ].freeze
 
       VALID_TREE_PARAM_VALUES = {
@@ -28,6 +29,12 @@ module Github
       #    file.path
       #  end
       #
+      # Get a tree recursively
+      #
+      # = Examples
+      #  @github = Github.new
+      #  @github.git_data.tree 'user-name', 'repo-name', 'sha', 'recursive' => true
+      #
       def tree(user_name, repo_name, sha, params={})
         _update_user_repo_params(user_name, repo_name)
         _validate_user_repo_params(user, repo) unless user? && repo?
@@ -43,6 +50,7 @@ module Github
         return response unless block_given?
         response.tree.each { |el| yield el }
       end
+      alias :get_tree :tree
 
       # Create a tree
       #
@@ -73,11 +81,13 @@ module Github
       #      ...
       #    ]
       #
-      def create_tree(user_name=nil, repo_name=nil, params={})
+      def create_tree(user_name, repo_name, params={})
         _update_user_repo_params(user_name, repo_name)
         _validate_user_repo_params(user, repo) unless user? && repo?
         _normalize_params_keys(params)
 
+        raise ArgumentError, "Required param: 'tree'" unless _validate_inputs(%w[ tree ], params)
+
         _filter_params_keys(VALID_TREE_PARAM_NAMES, params['tree'])
         _validate_params_values(VALID_TREE_PARAM_VALUES, params['tree'])
 

data/lib/github_api/issues/labels.rb

@@ -171,10 +171,11 @@ module Github
       #
       def replace_labels(user_name, repo_name, issue_id, *args)
         params = args.last.is_a?(Hash) ? args.pop : {}
-        params['data'] = [args].flatten unless args.nil?
+        params['data'] = args unless args.empty?
+
         _update_user_repo_params(user_name, repo_name)
         _validate_user_repo_params(user, repo) unless user? && repo?
-        _validate_presence_of(issue_id)
+        _validate_presence_of issue_id
         _normalize_params_keys(params)
 
         put("/repos/#{user}/#{repo}/issues/#{issue_id}/labels", params)

data/lib/github_api/version.rb

@@ -4,7 +4,7 @@ module Github
   module VERSION
     MAJOR = 0
     MINOR = 3
-    PATCH = 7
+    PATCH = 8
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.');

data/spec/fixtures/git_data/blob.json

@@ -0,0 +1,4 @@
+{
+  "content": "Content of the blob",
+  "encoding": "utf-8"
+}

data/spec/fixtures/git_data/blob_sha.json

@@ -0,0 +1,3 @@
+{
+  "sha": "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15"
+}

data/spec/fixtures/git_data/tree.json

@@ -0,0 +1,29 @@
+{
+  "sha": "9fb037999f264ba9a7fc6274d15fa3ae2ab98312",
+  "url": "https://api.github.com/repo/octocat/Hello-World/trees/9fb037999f264ba9a7fc6274d15fa3ae2ab98312",
+  "tree": [
+    {
+      "path": "file.rb",
+      "mode": "100644",
+      "type": "blob",
+      "size": 30,
+      "sha": "44b4fc6d56897b048c772eb4087f854f46256132",
+      "url": "https://api.github.com/octocat/Hello-World/git/blobs/44b4fc6d56897b048c772eb4087f854f46256132"
+    },
+    {
+      "path": "subdir",
+      "mode": "040000",
+      "type": "tree",
+      "sha": "f484d249c660418515fb01c2b9662073663c242e",
+      "url": "https://api.github.com/octocat/Hello-World/git/blobs/f484d249c660418515fb01c2b9662073663c242e"
+    },
+    {
+      "path": "exec_file",
+      "mode": "100755",
+      "type": "blob",
+      "size": 75,
+      "sha": "45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
+      "url": "https://api.github.com/octocat/Hello-World/git/blobs/45b983be36b73c0788dc9cbcb76cbb80fc7bb057"
+    }
+  ]
+}

data/spec/github/git_data/blobs_spec.rb

@@ -1,5 +1,112 @@
 require 'spec_helper'
 
 describe Github::GitData::Blobs do
-  pending
-end
+  include SpecHelpers::Base
+
+  let(:sha) { "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15" }
+
+  it { described_class::VALID_BLOB_PARAM_NAMES.should_not be_nil }
+
+  describe "blob" do
+    it { github.git_data.should respond_to :blob }
+    it { github.git_data.should respond_to :get_blob }
+
+    context "resource found" do
+      before do
+        stub_get("/repos/#{user}/#{repo}/git/blobs/#{sha}").
+          to_return(:body => fixture('git_data/blob.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to get resource without sha" do
+        expect { github.git_data.blob(user, repo, nil)}.to raise_error(ArgumentError)
+      end
+
+      it "should get the resource" do
+        github.git_data.blob user, repo, sha
+        a_get("/repos/#{user}/#{repo}/git/blobs/#{sha}").should have_been_made
+      end
+
+      it "should get blob information" do
+        blob = github.git_data.blob user, repo, sha
+        blob.content.should eql "Content of the blob"
+      end
+
+      it "should return mash" do
+        blob = github.git_data.blob user, repo, sha
+        blob.should be_a Hashie::Mash
+      end
+    end
+
+    context "resource not found" do
+      before do
+        stub_get("/repos/#{user}/#{repo}/git/blobs/#{sha}").
+          to_return(:body => fixture('git_data/blob.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to retrive resource" do
+        expect {
+          github.git_data.blob user, repo, sha
+        }.to raise_error(Github::ResourceNotFound)
+      end
+    end
+  end # blob
+
+  describe "create_blob" do
+    let(:inputs) {
+      {
+        "content" => "Content of the blob",
+        "encoding" =>  "utf-8"
+      }
+    }
+
+    context "resouce created" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/git/blobs").
+          with(:body => JSON.generate(inputs)).
+          to_return(:body => fixture('git_data/blob_sha.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to create resource if 'content' input is missing" do
+        expect {
+          github.git_data.create_blob user, repo, inputs.except('content')
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should fail to create resource if 'encoding' input is missing" do
+        expect {
+          github.git_data.create_blob user, repo, inputs.except('encoding')
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should create resource successfully" do
+        github.git_data.create_blob user, repo, inputs
+        a_post("/repos/#{user}/#{repo}/git/blobs").with(inputs).should have_been_made
+      end
+
+      it "should return the resource" do
+        blob_sha = github.git_data.create_blob user, repo, inputs
+        blob_sha.should be_a Hashie::Mash
+      end
+
+      it "should get the blob information" do
+        blob_sha = github.git_data.create_blob user, repo, inputs
+        blob_sha.sha.should == sha
+      end
+    end
+
+    context "failed to create resource" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/git/blobs").with(inputs).
+          to_return(:body => fixture('git_data/blob_sha.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      end
+
+      it "should faile to retrieve resource" do
+        expect {
+          github.git_data.create_blob user, repo, inputs
+        }.to raise_error(Github::ResourceNotFound)
+      end
+    end
+  end # create_blob
+
+end # Github::GitData::Blobs

data/spec/github/git_data/trees_spec.rb

@@ -1,5 +1,134 @@
 require 'spec_helper'
 
 describe Github::GitData::Trees do
-  pending
-end
+  include SpecHelpers::Base
+
+  let(:sha) { "9fb037999f264ba9a7fc6274d15fa3ae2ab98312" }
+
+  it { described_class::VALID_TREE_PARAM_NAMES.should_not be_nil }
+
+  describe "tree" do
+    it { github.git_data.should respond_to :tree }
+    it { github.git_data.should respond_to :get_tree }
+
+    context "non-resursive" do
+      before do
+        stub_get("/repos/#{user}/#{repo}/git/trees/#{sha}").
+          to_return(:body => fixture('git_data/tree.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to get resource without sha" do
+        expect { github.git_data.tree(user, repo, nil)}.to raise_error(ArgumentError)
+      end
+
+      it "should get the resource" do
+        github.git_data.tree user, repo, sha
+        a_get("/repos/#{user}/#{repo}/git/trees/#{sha}").should have_been_made
+      end
+
+      it "should get tree information" do
+        tree = github.git_data.tree user, repo, sha
+        tree.sha.should eql sha
+      end
+
+      it "should return mash" do
+        tree = github.git_data.tree user, repo, sha
+        tree.should be_a Hashie::Mash
+      end
+    end
+
+    context "resursive" do
+      before do
+        stub_get("/repos/#{user}/#{repo}/git/trees/#{sha}?recursive=1").
+          to_return(:body => fixture('git_data/tree.json'), :status => 200, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should get the resource" do
+        github.git_data.tree user, repo, sha, 'recursive' => true
+        a_get("/repos/#{user}/#{repo}/git/trees/#{sha}?recursive=1").should have_been_made
+      end
+
+      it "should get tree information" do
+        tree = github.git_data.tree user, repo, sha, 'recursive' => true
+        tree.sha.should eql sha
+      end
+
+      it "should return mash" do
+        tree = github.git_data.tree user, repo, sha, 'recursive' => true
+        tree.should be_a Hashie::Mash
+      end
+    end
+
+    context "resource not found" do
+      before do
+        stub_get("/repos/#{user}/#{repo}/git/trees/#{sha}").
+          to_return(:body => fixture('git_data/tree.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to retrive resource" do
+        expect {
+          github.git_data.tree user, repo, sha
+        }.to raise_error(Github::ResourceNotFound)
+      end
+    end
+  end # tree
+
+  describe "create_tree" do
+    let(:inputs) {
+      {
+        "tree" => [
+          {
+            "path" => "file.rb",
+            "mode" => "100644",
+            "type" =>  "blob",
+            "sha" => "44b4fc6d56897b048c772eb4087f854f46256132"
+          }
+        ]
+      }
+    }
+
+    context "resouce created" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/git/trees").
+          with(:body => JSON.generate(inputs)).
+          to_return(:body => fixture('git_data/tree.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+
+      it "should fail to create resource if 'content' input is missing" do
+        expect {
+          github.git_data.create_tree user, repo, inputs.except('tree')
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should create resource successfully" do
+        github.git_data.create_tree user, repo, inputs
+        a_post("/repos/#{user}/#{repo}/git/trees").with(inputs).should have_been_made
+      end
+
+      it "should return the resource" do
+        tree_sha = github.git_data.create_tree user, repo, inputs
+        tree_sha.should be_a Hashie::Mash
+      end
+
+      it "should get the tree information" do
+        tree_sha = github.git_data.create_tree user, repo, inputs
+        tree_sha.sha.should == sha
+      end
+    end
+
+    context "failed to create resource" do
+      before do
+        stub_post("/repos/#{user}/#{repo}/git/trees").with(inputs).
+          to_return(:body => fixture('git_data/tree.json'), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      end
+
+      it "should faile to retrieve resource" do
+        expect {
+          github.git_data.create_tree user, repo, inputs
+        }.to raise_error(Github::ResourceNotFound)
+      end
+    end
+  end # create_tree
+
+end # Github::GitData::Trees

data/spec/github/issues/milestones_spec.rb

@@ -3,10 +3,8 @@ require 'spec_helper'
 describe Github::Issues::Milestones do
   include SpecHelpers::Base
 
-  let(:milestones_api) { Github::Issues::Milestones }
-
-  it { milestones_api::VALID_MILESTONE_OPTIONS.should_not be_nil }
-  it { milestones_api::VALID_MILESTONE_INPUTS.should_not be_nil }
+  it { described_class::VALID_MILESTONE_OPTIONS.should_not be_nil }
+  it { described_class::VALID_MILESTONE_INPUTS.should_not be_nil }
 
   describe 'milestones' do
     it { github.issues.should respond_to :milestones }

metadata

@@ -2,7 +2,7 @@
 name: github_api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Piotr Murach
@@ -233,6 +233,9 @@ files:
 - spec/fixtures/auths/authorization.json
 - spec/fixtures/auths/authorizations.json
 - spec/fixtures/events/events.json
+- spec/fixtures/git_data/blob.json
+- spec/fixtures/git_data/blob_sha.json
+- spec/fixtures/git_data/tree.json
 - spec/fixtures/issues/comment.json
 - spec/fixtures/issues/comments.json
 - spec/fixtures/issues/event.json