archivist-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY4Y2RkMTIyYjllODFiM2I1MzM2OTQ4NzY4M2VmMGQ2NzcwMTM4MQ==
+    MTZkNjQ0ZjExM2RhYWI2ZTRjZGYxYWRhMzZmZmFiMDQzNDYxYzA3NA==
   data.tar.gz: !binary |-
-    ZTAxZTNmNDlkODgwNDZjNzViYjlmNWRlNWUwYjkyODVhYjEwZjJlYw==
+    MzA3MDBlNWJkNjBiODA5MjQ3OGIwNGQ3MWY5MjUyZDI4YmYyOTFkMw==
 SHA512:
   metadata.gz: !binary |-
-    OGM4NmFhN2YyOWJkZDEyOWU2NWJiZDU4YTEzMTUwOTA3YWQ5Zjc1NmE5MWI0
-    OGE1ZTAxODJhMmM4MGYyOWExYWM0NDJkYmVhYmUxNDNlMDRkNmY3ZDhjZmMw
-    OWNhZDdkMmI0NWNmN2JmMTA1NWU5Mzc5YWZjMDc3ZDQ0ZThiZTE=
+    ZTI2YjIzNDI0NTA2MDczYWMxNzI0MzhhMDYyMTA0NmFhZDY4ZjcwNmJiYzc2
+    MjNmNjU3YzU2ZmExNzBiMzg5MDdkZWVjNmFiMTRhZWQyYTVmYjZlNWMzYTBl
+    OGIwN2ViNTM3ZjA1NDFhOTU3NjA2MTA4OTY4YTM5NDRkNDU4NTY=
   data.tar.gz: !binary |-
-    ZDg4NjEzMDQ3YmI0NmJjYjQzN2NjNWVjYzU0MjRiNmFkMjE3MjAwNzQzZWUw
-    NjQwNTZmOTM5ZDU5NGJjYWFlOGFhNzk3MzIzMDhhM2E5NGNlOTU1MjFmNjkw
-    MGQ4NjIzNjQ2N2M3MmEwNzljZWUzNWU0NzkyYWVjN2U0MTY0ZDE=
+    ZjE4Y2FjZTQ2MTIyZDgwNjYwNmI5OGU1MzI1NzI0YjhjZTRhN2UyODQwY2I1
+    ZGQwOWYwMDAwMTY4YTkwYzYyN2I4MDQ4Nzc2ODRkOGU1Y2I2Y2U2MzJhMzNk
+    MDkxN2I4OWIyYTU3NTMzMWJmZjA0MjdlZDdkNmQ0ZDgwZWE5NzE=

data/archivist-client.gemspec

@@ -25,11 +25,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rspec", "~> 2.6"
   gem.add_development_dependency "debugger"
-  gem.add_development_dependency "webmock"
+  gem.add_development_dependency "webmock", [">= 1.8.0", "< 1.16"]
   gem.add_development_dependency "vcr"
   gem.add_development_dependency "reek", ">= 1.2.8"
   gem.add_development_dependency "roodi", ">= 2.1.0"
   gem.add_development_dependency "gem-release", ">= 0.7.1"
+  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "rdoc", ">= 3.12"
 
   gem.add_dependency "virtus", "~> 1.0.0"
   gem.add_dependency "representable"

data/lib/archivist/client/base.rb

@@ -42,14 +42,16 @@ module Archivist
       def search(opts = {})
         Model::QueryResponse.new.tap do |qr|
           response = @conn.get('/advancedsearch.php', params(opts))
-          Representation::QueryResponse.new(qr).from_json(response.body)
+          rep = Representation::QueryResponse.new(qr)
+          puts "#{rep.inspect}"
+          rep.from_json(response.body)
         end
       end
 
       private
 
       def query(opts)
-        @filters.update!(opts)
+        @filters.update(opts)
         @filters.to_query
       end
 

data/lib/archivist/client/filters.rb

@@ -26,27 +26,27 @@ module Archivist
 
       def initialize(opts)
         @options = {}
-        self.update!(opts)
+        self.update(opts)
       end
 
-      def update!(opts)
-        self.prune_options!(opts)
-        self.set_language!
-        self.set_years!
-        self.set_filters!
+      def update(opts)
+        self.prune_options(opts)
+        self.set_language
+        self.set_years
+        self.set_filters
       end
 
       # May result in a URI with filters looking like:
       #   http://archive.org/advancedsearch.php?fl%5B0%5D=identifier&fl%5B1%5D=title&fl%5B2%5D=creator&fl%5B3%5D=date&fl%5B4%5D=language&fl%5B5%5D=mediattype&output=json&page=1&q=mediatype:texts%20AND%20-mediatype:collection%20AND%20(language:eng%20OR%20language:English)%20AND%20date:%5B1500-01-01%20TO%201550-12-31%5D&rows=50&sort%5B0%5D=date%20asc
       alias :to_query :to_s
       def to_query
-        self.finalize_filters!
+        self.finalize_filters
         @filters.join(' AND ')
       end
 
       protected
 
-      def prune_options!(opts)
+      def prune_options(opts)
         # Save the options we need to build the filter
         @options.merge!(opts)
         # Remove the options used from the passed in options, so they don't get converted into parameters
@@ -55,21 +55,21 @@ module Archivist
         end
       end
 
-      # Only overwrite if update! options has language key
-      def set_language!
+      # Only overwrite if update options has language key
+      def set_language
         @language = @options[:language] if @options.has_key?(:language)
       end
 
-      def set_years!
+      def set_years
         start = @options[:start_year]
         finish = @options[:end_year]
         @start_year = "#{start}-01-01" if start
         @end_year = "#{finish}-12-31" if finish
-        self.validate_years!
+        self.validate_years
       end
 
       # If one is provided, they must *both* be provided
-      def validate_years!
+      def validate_years
         unless @start_year && @end_year
           raise FilterException, ":start_year and :end_year must always be provided together, but only :start_year provided as #{@start_year}." if @start_year
           raise FilterException, ":start_year and :end_year must always be provided together, but only :end_year provided as #{@end_year}." if @end_year
@@ -77,12 +77,12 @@ module Archivist
         return true
       end
 
-      def set_filters!
+      def set_filters
         @filters = Array(@options[:filters]) # If opts[:filters] is nil => self.array is []
         @filters |= DEFAULT_FILTERS
       end
 
-      def add_language_filter!
+      def add_language_filter
         @filters << if @language
                           "language:#{@language}"
                         else
@@ -90,13 +90,13 @@ module Archivist
                         end
       end
 
-      def add_date_filter!
+      def add_date_filter
         @filters << "date:[#{@start_year} TO #{@end_year}]"
       end
 
-      def finalize_filters!
-        self.add_language_filter!
-        self.add_date_filter!
+      def finalize_filters
+        self.add_language_filter
+        self.add_date_filter
         self
       end
     end

data/lib/archivist/client/version.rb

@@ -1,5 +1,5 @@
 module Archivist
   module Client
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/archivist/models/document.rb

@@ -28,7 +28,8 @@ module Archivist
       def format_index
         response = @conn.get(index_xml_path)
         Model::FormatIndex.new.tap do |idx|
-          Representation::FormatIndex.new(idx).from_xml(response.body)
+          rep = Representation::FormatIndex.new(idx)
+          rep.from_xml(response.body)
         end
       end
 

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 require 'vcr'
-require 'archivist/models'
-require 'archivist/representations/query_response'
+
+# For code coverage, must be required before all application / gem / library code.
+require 'coveralls'
+Coveralls.wear!
+
+require 'archivist-client'
 
 def fixture(filename)
   File.join(File.dirname(__FILE__), 'fixtures', filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archivist-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Duane Johnson
@@ -73,14 +73,20 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +143,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement