glean 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef361aff0e067fc8e6ca38c995e4a8d9e24f7057
-  data.tar.gz: aec3ef4aa72bc1bb342401022721ecb61dccf9b4
+  metadata.gz: 850bd570e20bd6c5b16d56ff815d4ce8f17cadf2
+  data.tar.gz: 90dd0a4078f92a389a233cfc03fdad3898c025ee
 SHA512:
-  metadata.gz: c306874b417f9bf273570177d2f8807279440519fd6496c070f809826613b32b7c5bff5257ac3b190377fee57ef32c26f06aae41b602b41ffad639635ead1c53
-  data.tar.gz: ba09ff2706b7615ca981fac19dd5a2b8146b24d6be584a7ccc512ce7cdea439e634c1522da7e5e53d04c63eee86bf9504c10e7e14b1e5082ad0ffcf27085772b
+  metadata.gz: 1f15ca60742ff3daae487fa54fc14db9b5d9107e9ded7b149e1fe8387c7bd4777f8ec368c2e10d8251a8e33b9ead2b78a4957f8b8cd106c2f052ab39cfd3af2e
+  data.tar.gz: 0a77eccd354168bfa461db5b89c04a2a0265f2e47cb752f478758122e4bc2e1d2a328fdc59fa1b3970e8bcc1a8f3ee93be5b6c561cd859115e9084637312c636

data/README.md

@@ -17,10 +17,15 @@ Each file represents one piece of data (a hash of hashes). Filenames and directo
 ## Sources
 Glean datasets are available from three distinct sources:
 
-* [Core](http://github.com/glean) - Available via search, hosted on the Glean GitHub organization
-* TODO
-  * Contrib - Available via search (using --contrib)
-  * User - Directly available via URL
+1. [Core](http://github.com/glean)
+  * Available via search
+  * Hosted on the Glean GitHub organization
+1. [Contrib](https://github.com/glean/glean-contrib)
+  * Available via search using --contrib
+  * Hosted on GitHub and cataloged by [Glean Contrib](https://github.com/glean/glean-contrib)
+1. User
+  * TODO
+  * Directly available via URL
 
 ## Installation
 ```
@@ -55,6 +60,7 @@ COMMANDS
 ```
 
 ### Examples
+__Core:__
 ```
 $ glean export countries --format=json
 {"name":"Andorra","code":"ad"}
@@ -75,6 +81,14 @@ name: Arkansas
 abbreviation: ar
 ...
 ```
+__Contrib:__
+```
+$ glean export lagalaxy/trophies --format=json
+{"competition":"MLS Supporters' Shield","year":1998}
+{"competition":"CONCACAF Champions' League","year":2000}
+{"competition":"Lamar Hunt U.S. Open Cup","year":2001}
+...
+```
 
 ## Rails
 

data/bin/glean

@@ -44,8 +44,10 @@ end
 desc 'Search for datasets'
 arg_name '<query>'
 command :search do |c|
+  c.switch :contrib
   c.action do |global_options,options,args|
-    Glean::Source.search(args[0]).each do |datasource|
+    source = options[:contrib] ? :contrib : :core
+    Glean::Source.search(args[0], source).each do |datasource|
       puts "#{datasource.name} -- #{datasource.description}"
     end
   end

data/glean.gemspec

@@ -5,13 +5,12 @@ spec = Gem::Specification.new do |s|
   s.version = Glean::VERSION
   s.author = 'John Britton'
   s.email = 'public@johndbritton.com'
-  s.homepage = 'http://github.com/johndbritton/glean'
+  s.homepage = 'http://github.com/glean/glean'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A description of your project'
   s.files = `git ls-files`.split($/)
   s.require_paths << 'lib'
-  s.has_rdoc = true
-  s.rdoc_options << '--title' << 'glean' << '--main' << 'README.rdoc' << '-ri'
+  s.rdoc_options << '--title' << 'glean' << '--main' << 'README.rdoc'
   s.bindir = 'bin'
   s.executables << 'glean'
   s.add_development_dependency('rake')

data/lib/glean/dataset.rb

@@ -1,5 +1,7 @@
 module Glean
   class Dataset
+    include Enumerable
+
     attr_reader :identifier
 
     def initialize(identifier, dir="~")

data/lib/glean/source.rb

@@ -8,8 +8,8 @@ module Glean
       end
     end
 
-    def self.search(query)
-      (Core.search(query) + Contrib.search(query) + User.search(query)).sort { |a, b| a.name <=> b.name }
+    def self.search(query, source)
+      self.const_get(source.capitalize).search(query).sort { |a, b| a.name <=> b.name }
     end
 
     def self.info(identifier)

data/lib/glean/source/contrib.rb

@@ -1,8 +1,17 @@
 module Glean
   module Source
     module Contrib
+
+      class SearchResult < Struct.new(:name, :description)
+      end
+
       def self.search(query)
-        []
+        query = "" if query.nil?
+        Glean::Dataset.new('glean/glean-contrib').each_with_object([]) do |source, results|
+          name = source.identifier
+          description = "#{source.name}: #{source.description}"
+          results << SearchResult.new(name, description) if description.include?(query)
+        end
       end
     end
   end

data/lib/glean/version.rb

@@ -1,3 +1,3 @@
 module Glean
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/spec/glean/source/contrib_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "Glean::Source::Contrib" do
+
+  describe "#search" do
+    let(:name) { "lagalaxy/trophies" }
+    let(:description) { "lagalaxy trophies: Major trophies won by the LA Galaxy" }
+
+    subject(:result) { Glean::Source::Contrib.search("galaxy").first }
+
+    it "should find lagalaxy trophies source" do
+      expect(result.name).to eq(name)
+    end
+
+    it "and provide a description" do
+      expect(result.description).to eq(description)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glean
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - John Britton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -204,8 +204,9 @@ files:
 - lib/glean/source/user.rb
 - lib/glean/version.rb
 - spec/glean/models/dataset_spec.rb
+- spec/glean/source/contrib_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/johndbritton/glean
+homepage: http://github.com/glean/glean
 licenses: []
 metadata: {}
 post_install_message: 
@@ -214,7 +215,6 @@ rdoc_options:
 - glean
 - --main
 - README.rdoc
-- -ri
 require_paths:
 - lib
 - lib
@@ -235,3 +235,4 @@ signing_key:
 specification_version: 4
 summary: A description of your project
 test_files: []
+has_rdoc: