social_snippet-registry_core 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZmOWVmZDhiMjZkNzY1YzM5YjdiNWJjNGE1NmFlNmE3Zjc3MDFhNw==
+    NTIzMWFjOWJkZTIxYmZlMDlkZmZlZjM2ZjczYzZlYWM0NzdiMGNiZg==
   data.tar.gz: !binary |-
-    NGYzNmRkNDNkMzNiOWJjMDcyMTA2M2U4YzhkMmZhOTBiNDFjMWY4Mw==
+    ZTY3N2ZjYmQ4OWI2NDA5YWY0ZWIwZjJjMzZkZTNmY2QyOTk2MzVkNQ==
 SHA512:
   metadata.gz: !binary |-
-    MWU3MDNlZTNhMzgzMTQ3OGViYWQ4YTJhNzlkM2U5Y2UzNDFiZDI4OTI5MDNk
-    ZWUxMmRkMTY4ZDI4YjU1OTNhZGVkNmExZmJkNTAxY2RiMmE0OTM4N2JjNDZj
-    MjlhMGRhODhhOTc5MzM1YTA3M2ViZjExYjZiZjVjYWJmMDE0MTk=
+    MzU1NzhmNGI1MGFhMDhjNzJjYWYxMzZkN2U3YjZjNTA3MDM4MDlmNmFjOWM2
+    YjUxOTNmZTY3Y2ViYzg3NDQ2MjdkNWMyNzYyZTkwMDQ3YjcyMzFhZjg0M2Zm
+    NTA1MzA4ZTAyY2FhODZkOWM3MzM1ZWZkZWEzYmJhNjc5ZjExZTg=
   data.tar.gz: !binary |-
-    MTBkOTM2NTVkNDE2NzEwMTk0Y2MwMmQxMGRkOWJmZGVmNmFiMThhYzI0NGMz
-    ZGQwNGQ1N2ViYjViMjU0MzM0NTllMmUzYzQzZDExMDVmMDZjYmM2ZGNiMjZi
-    OTk4ZmExY2I3Y2YyODU0Mjg2MzI2M2EzYTU1NjgzY2ZlMzFiN2Q=
+    OWUyMWJkOTQzZWU0YjA2NjY3NWI4NGU3NmM5MzVmNDNhYjU2YjVhY2U0NTVk
+    MDZlMDM2NTg2N2Y5NzQ4M2QzM2M4MTk0M2Q5MjcyZWNhZjQ3ZGI1NzVhODBj
+    NWYzYTA2YzY1YzI2MzU3ZTg2ZDIzOGZlN2I1OWUwM2E3NzRhZGE=

data/lib/social_snippet/registry/webapi/controllers/v0/repositories_controller.rb

@@ -1,40 +1,37 @@
-module SocialSnippet::Registry::WebAPI
-
-  WebAPIv0.controllers :repositories do
-
-    # GET /repositories
-    get :index, :provides => :json do
-      if params[:q].nil?
-        Repository.all_repos.to_json
-      else
-        Repository.query(params[:q]).to_json
-      end
+SocialSnippet::Registry::WebAPI::WebAPIv0.controllers :repositories do
+
+  # GET /repositories
+  get :index, :provides => :json do
+    if params[:q].nil?
+      SocialSnippet::Registry::WebAPI::Repository.all_repos.to_json
+    else
+      SocialSnippet::Registry::WebAPI::Repository.query(params[:q]).to_json
     end
+  end
+
+  # GET /repositories/{repo-name}
+  get :index, :with => [:id] do
+    repo_model = SocialSnippet::Registry::WebAPI::Repository.find_by(:name => params[:id])
+    repo_model.to_object.to_json
+  end
+
+  # POST /repositories
+  #
+  # @param url [String]
+  post :index, :provides => :json do
+    repo_url = normalize_url(params[:url])
+    fetcher = create_fetcher(repo_url)
+
+    info = fetcher.snippet_json(repo_url)
+    repo = SocialSnippet::Registry::WebAPI::Repository.create_by_snippet_json(info)
+    repo.url = repo_url
+    repo.save!
+
+    {
+      :name => repo.name,
+      :status => "ok",
+    }.to_json
+  end
+
+end # repositories
 
-    # GET /repositories/{repo-name}
-    get :index, :with => [:id] do
-      repo_model = Repository.find_by(:name => params[:id])
-      repo_model.to_object.to_json
-    end
-
-    # POST /repositories
-    #
-    # @param url [String]
-    post :index, :provides => :json do
-      repo_url = normalize_url(params[:url])
-      fetcher = create_fetcher(repo_url)
-
-      info = fetcher.snippet_json(repo_url)
-      repo = Repository.create_by_snippet_json(info)
-      repo.url = repo_url
-      repo.save!
-
-      {
-        :name => repo.name,
-        :status => "ok",
-      }.to_json
-    end
-
-  end # controllers
-
-end # WebAPI

data/lib/social_snippet/registry/webapi/controllers/v0/token_controller.rb

@@ -1,6 +1,4 @@
-module SocialSnippet::Registry::WebAPI
-
-  WebAPIv0.controllers :token do
+SocialSnippet::Registry::WebAPI::WebAPIv0.controllers :token do
 
     # GET /token
     # returns csrf token
@@ -8,6 +6,4 @@ module SocialSnippet::Registry::WebAPI
       csrf_token
     end
 
-  end
-
 end

data/lib/social_snippet/registry/webapi/controllers/v0/user_controller.rb

@@ -1,53 +1,46 @@
-module SocialSnippet::Registry::WebAPI
+SocialSnippet::Registry::WebAPI::WebAPIv0.controllers :user do
 
-  WebAPIv0.controllers :user do
+  sspm_enable_session
+  sspm_enable_user_access_control
 
-    sspm_enable_session
-    sspm_enable_user_access_control
-
-    get "/repositories", :provides => :json do
-      halt 403 unless logged_in?
-      if current_account.github_repos.nil?
-        return {}.to_json
-      end
-      current_account.github_repos.map do |repo_name|
-        {
-          :name => repo_name,
-        }
-      end.to_json
+  get "/repositories", :provides => :json do
+    halt 403 unless logged_in?
+    if current_account.github_repos.nil?
+      return {}.to_json
     end
+    current_account.github_repos.map do |repo_name|
+      {
+        :name => repo_name,
+      }
+    end.to_json
+  end
 
-    put "/repositories", :provides => :json do
-      client = ::Octokit::Client.new(:access_token => current_account.github_access_token)
-      client.auto_paginate = true
-      repos = SortedSet.new
-
-      repos.merge(
-        client.repos.select do |repo|
-          repo["permissions"]["admin"]
-        end.map do |repo|
-          repo["full_name"]
-        end
-      )
-      repos.merge(
-        client.orgs.map do |org|
-          client.org_repos(org.login, {:type => "all"}).select do |repo|
-            repo["permissions"]["admin"]
-          end.map do |repo|
-            repo["full_name"]
-          end
-        end.flatten
-      )
-      
-      current_account.update_attributes :github_repos => repos.to_a
-
-      current_account.github_repos.map do |repo_name|
-        {
-          :name => repo_name,
-        }
-      end.to_json
+  put "/repositories", :provides => :json do
+    client = ::Octokit::Client.new(:access_token => current_account.github_access_token)
+    client.auto_paginate = true
+    repos = ::SortedSet.new
+
+    user_repos = client.repos.select do |repo|
+      repo["permissions"]["admin"]
+    end.map do |repo|
+      repo["full_name"]
     end
 
+    org_repos = client.orgs.map do |org|
+      client.org_repos(org.login, {:type => "all"}).select do |repo|
+        repo["permissions"]["admin"]
+      end.map do |repo|
+        repo["full_name"]
+      end
+    end.flatten
+
+    repos.merge user_repos
+    repos.merge org_repos
+
+    current_account.update_attributes :github_repos => repos.to_a
+
+    current_account.github_repos_names.to_json
   end
 
 end
+

data/lib/social_snippet/registry/webapi/models/repository.rb

@@ -36,49 +36,26 @@ class SocialSnippet::Registry::WebAPI::Repository
   # validations
   #
   validates_presence_of :name
+  validates_presence_of :url
   validates_length_of :name, :minimum => 1, :maximum => 64
-  validates_each :name do |model, key, value|
-    model.errors[:name] << "Invalid name" unless self.is_valid_repo_name?(value)
-  end
-
   validates_length_of :desc, :maximum => 200
-
   validates_length_of :url, :maximum => 256
-  validates_each :url do |model, key, value|
-    model.errors[:url] << "Invalid URL" unless self.is_valid_url?(value)
-  end
-  validates_presence_of :url
-
-  validates_each :dependencies do |model, key, value|
-    next unless value.is_a?(Array)
-    value.each do |dep|
-      unless self.is_valid_repo_name?(dep)
-        model.errors[:dependencies] << "invalid deps"
-        break
-      end
-    end
-  end
+  validates_length_of :license, :maximum => 64
 
-  validates_each :dependencies do |model, key, value|
-    next unless value.is_a?(Array)
-    model.errors[:dependencies] << "The size of dependencies must be less than 64" if value.length > 64
+  validate do
+    errors[:name] << "Invalid name" unless self.class.is_valid_repo_name?(name)
+    errors[:url] << "Invalid URL" unless self.class.is_valid_url?(url)
+    errors[:dependencies] << "invalid dependencies" if has_invalid_dependencies?
+    errors[:dependencies] << "The size of dependencies must be less than 64" if dependencies.length > 64
+    errors[:languages] << "The size of languages must be less than 64" if languages.length > 64
   end
 
-  validates_length_of :license, :maximum => 64
-
-  validates_each :languages do |model, key, value|
-    next unless value.is_a?(Array)
-    value.each do |lang|
-      unless self.is_valid_language?(lang)
-        model.errors[:languages] << "invalid language"
-        break
-      end
-    end
+  def has_invalid_dependencies?
+    dependencies.any? {|dep_name| not self.class.is_valid_repo_name?(dep_name) }
   end
 
-  validates_each :languages do |model, key, value|
-    next unless value.is_a?(Array)
-    model.errors[:languages] << "The size of languages must be less than 64" if value.length > 64
+  def has_invalid_language?
+    languages.any? {|language| not self.class.is_valid_language?(lang) }
   end
 
   #

data/lib/social_snippet/registry_core/models/user_account.rb

@@ -14,6 +14,12 @@ class SocialSnippet::RegistryCore::Models::UserAccount
 
   # You can create a composite key in mongoid to replace the default id using the key macro:
   # key :field <, :another_field, :one_more ....>
+  
+  def github_repos_names
+    github_repos.map do |repo_name|
+      { :name => repo_name, }
+    end
+  end
 
   def self.find_by_id(s)
     if s.nil?

data/lib/social_snippet/registry_core/version.rb

@@ -1,5 +1,5 @@
 module SocialSnippet
   module RegistryCore
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/spec/webapi/models/user_account_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+module SocialSnippet::RegistryCore::Models
+
+  describe UserAccount do
+
+    let(:user) do
+      UserAccount.new(
+        :github_repos => [
+          "foo/bar"
+        ]
+      )
+    end
+
+    subject { user.github_repos_names.map {|r| r[:name] } }
+    it { should include "foo/bar" }
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_snippet-registry_core
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Hiroyuki Sano
@@ -308,6 +308,7 @@ files:
 - spec/webapi/controllers/v0/repositories_controller_spec.rb
 - spec/webapi/helpers/url_helper_spec.rb
 - spec/webapi/models/repository_spec.rb
+- spec/webapi/models/user_account_spec.rb
 - test/repository_test.rb
 homepage: https://sspm.herokuapp.com
 licenses:
@@ -342,4 +343,5 @@ test_files:
 - spec/webapi/controllers/v0/repositories_controller_spec.rb
 - spec/webapi/helpers/url_helper_spec.rb
 - spec/webapi/models/repository_spec.rb
+- spec/webapi/models/user_account_spec.rb
 - test/repository_test.rb