booklist 0.0.1 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aa6eb403053898f7677b45118fb2ae78fe33c6fe
+  data.tar.gz: 3c3a141cbb261f36115e67b51253ccf597534445
+SHA512:
+  metadata.gz: 6f765a2a23c68fefe682ccae5c9665879f4a68fc44f7a28a46961e6cb5f263e024d4f2c84ee8e180072778658ab31a1065acaa90417def68ca4aea5af3ecac97
+  data.tar.gz: f4cbc5aa0b7cac9be2f71bc174f8a0b29e8140c37ee6de592ecb5dfa45cd2c98b1be42069ab7f2fca2ca23bcf32c49f48cd3c5e029d6e1baa841a965059f5753

data/bin/booklist

@@ -23,15 +23,17 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'optparse'
+require 'optparse/date'
 require 'ostruct'
 require 'rubygems'
 require 'active_record'
 require 'yaml'
 require 'pathname'
+require 'booklist'
+require 'date'
 
 module Booklist
   options = OpenStruct.new
-  STATES = { "read" => "Mark as read", "reading" => "Mark as currently reading", "toread" => "Mark as to-read" }
   options.act_num = 0
   usage = nil
   OptionParser.new do |opts|
@@ -95,6 +97,10 @@ module Booklist
       options.tags = tags
     end
 
+    opts.on("--date_read DATE", Date, "Date read (eg 2014-02-14)") do |dr|
+      options.date_read = dr
+    end
+
     opts.on("--id ID", Integer, "Book ID number") do |id|
       options.id = id
     end
@@ -107,7 +113,7 @@ module Booklist
     #  options.config_file = file
     #end
 
-    opts.on("--debug", "Debug node") do
+    opts.on("--debug", "Debug mode") do
       options.debug = true
     end
 
@@ -116,7 +122,7 @@ module Booklist
     end
 
     opts.on_tail("--version", "Get the booklist version") do
-      puts Booklist::version
+      puts Booklist::VERSION
       exit
     end
 
@@ -149,43 +155,6 @@ module Booklist
     ActiveRecord::Migrator.migrate('db/migrate')
   end
 
-  class Book < ActiveRecord::Base
-    has_many :taggings
-    has_many :tags, through: :taggings #, source: "book_id"
-    validates :title, presence: true
-
-    def cli_display
-      puts "ID: #{id}\n"
-      puts "Title: #{title}\n"
-      puts "Author: #{author}\n" if author
-      puts "Additional authors: #{addn_authors}" if addn_authors
-      puts "State: #{state}" if state
-      puts "Tags: #{tag_list}\n" if tags.count > 0
-      puts "\n"
-    end
-
-    def tag_list
-      #put tags
-      tags.map(&:name).join(", ")
-    end
-
-    def tag_list=(names)
-      self.tags = names.map do |n|
-        Tag.where(name: n.strip).first_or_create!
-      end
-    end
-  end
-
-  class Tag < ActiveRecord::Base
-    has_many :taggings
-    has_many :books, through: :taggings #, source: "tag_id"
-  end
-
-  class Tagging < ActiveRecord::Base
-    belongs_to :tag
-    belongs_to :book
-  end
-
   if options.act_num = 1
     if options.action == :add
       if !options.title || options.title == ""
@@ -196,8 +165,9 @@ module Booklist
       book = Book.new do |b|
         b.title = options.title
         b.author = options.author if options.author
-        b.addn_authors if options.addn_authors
+        b.addn_authors = options.addn_authors if options.addn_authors
         b.state = options.state if options.state
+        b.date_read = options.date_read if options.date_read
         b.tag_list = options.tags if options.tags
       end
       book.save
@@ -209,6 +179,7 @@ module Booklist
         book.author = options.author if options.author
         book.addn_authors = options.addn_authors if options.addn_authors
         book.state = options.state if options.state
+        book.date_read = options.date_read if options.date_read
         book.tag_list = options.tags if options.tags
         book.save
         book.cli_display
@@ -226,17 +197,18 @@ module Booklist
         puts "No book with ID of #{options.id} was found"
       end
     elsif options.action == :search
-      books = Book.where(["title LIKE ?", "%#{options.title}%"]) if options.title
-      # TODO - books << Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.author}%", "%#{options.author}%"]) if options.author
-      # TODO show unique records
-      books.each { |b|
-        b.cli_display
-      }
+      books = []
+      books += Book.where(["title LIKE ?", "%#{options.title}%"]).to_a if options.title
+      books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.author}%", "%#{options.author}%"]).to_a if options.author
+      books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.addn_authors}%", "%#{options.addn_authors}%"]).to_a if options.addn_authors
+      books += Book.where(["state = ?", "%#{options.state}%"]).to_a if options.state
+      books.uniq!
+      books.sort!{ |a, b| a.id <=> b.id}
+      books.select!{ |b| b.state == options.state} if options.state
+      books.each { |b| b.cli_display }
     elsif options.action == :list
       books = Book.all
-      books.each{ |b|
-        b.cli_display
-      }
+      books.each{ |b| b.cli_display }
     end
   elsif options.act_num > 1
     puts "Please only use one action."

data/booklist.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9'
   gem.add_dependency 'sqlite3'
   gem.add_dependency 'activerecord', '~> 4.0.0'
+  gem.add_development_dependency 'rspec'
 end

data/lib/booklist/book.rb

@@ -0,0 +1,29 @@
+module Booklist
+  class Book < ActiveRecord::Base
+    has_many :taggings
+    has_many :tags, through: :taggings #, source: "book_id"
+    validates :title, presence: true
+
+    def cli_display
+      puts "ID: #{id}\n"
+      puts "Title: #{title}\n"
+      puts "Author: #{author}\n" if author
+      puts "Additional authors: #{addn_authors}" if addn_authors
+      puts "State: #{state}" if state
+      puts "Date Read: #{date_read.to_date.to_s}" if date_read
+      puts "Tags: #{tag_list}\n" if tags.count > 0
+      puts "\n"
+    end
+
+    def tag_list
+      #put tags
+      tags.map(&:name).join(", ")
+    end
+
+    def tag_list=(names)
+      self.tags = names.map do |n|
+        Tag.where(name: n.strip).first_or_create!
+      end
+    end
+  end
+end

data/lib/booklist/tag.rb

@@ -0,0 +1,11 @@
+module Booklist
+  class Tag < ActiveRecord::Base
+    has_many :taggings
+    has_many :books, through: :taggings #, source: "tag_id"
+  end
+
+  class Tagging < ActiveRecord::Base
+    belongs_to :tag
+    belongs_to :book
+  end
+end

data/lib/booklist/version.rb

@@ -1,3 +1,3 @@
 module Booklist
-  VERSION = "0.0.1"
+  VERSION = "0.0.7"
 end

data/lib/booklist.rb

@@ -0,0 +1,3 @@
+require 'booklist/version'
+require 'booklist/book'
+require 'booklist/tag'

data/spec/book_spec.rb

@@ -0,0 +1,61 @@
+require 'support/active_record'
+require 'booklist/book'
+
+module Booklist
+  describe Book do
+    it "requires a name" do
+      subject.title = ""
+      expect(subject).to have_at_least(1).error_on(:title)
+      subject.title = "The Importance of Living"
+      expect(subject).to be_valid
+    end
+
+    context "simple book" do
+      let(:book) {
+        Book.new do |b|
+          b.title = "The Epic of Gilgamesh"
+        end
+      }
+
+      it "has no author" do
+        expect(book.author).to be_nil
+      end
+      it "has no additional authors" do
+        expect(book.addn_authors).to be_nil
+      end
+      it "has no state" do
+        expect(book.state).to be_nil
+      end
+      it "is a valid record" do
+        expect(book).to be_valid
+      end
+    end
+
+    context "complex book" do
+      let(:book) {
+        Book.new do |b|
+          b.title = "Kareem"
+          b.author = "Kareem Abdul-Jabbar"
+          b.addn_authors = "Mignon McCarthy"
+          b.state = "read"
+          b.date_read = '2001-01-01'
+        end
+      }
+      it "has an author" do
+        expect(book.author).to eq "Kareem Abdul-Jabbar"
+      end
+      it "has an additional author" do
+        expect(book.addn_authors).to eq "Mignon McCarthy"
+      end
+      it "has a state" do
+        expect(book.state).to eq "read"
+      end
+      it "has a custom read date" do
+        expect(book.date_read).to eq '2001-01-01'
+      end
+      it "is a valid record" do
+        expect(book).to be_valid
+      end
+    end
+  end
+end

data/spec/support/active_record.rb

@@ -0,0 +1,26 @@
+require 'active_record'
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+I18n.enforce_available_locales = false
+
+ActiveRecord::Migrator.up "db/migrate"
+
+module ActiveModel::Validations
+  # Extension to enhance `should have` on AR Model instances.  Calls
+  # model.valid? in order to prepare the object's errors object.
+  #
+  # You can also use this to specify the content of the error messages.
+  #
+  # @example
+  #
+  #     model.should have(:no).errors_on(:attribute)
+  #     model.should have(1).error_on(:attribute)
+  #     model.should have(n).errors_on(:attribute)
+  #
+  #     model.errors_on(:attribute).should include("can't be blank")
+  def errors_on(attribute)
+    self.valid?
+    [self.errors[attribute]].flatten.compact
+  end
+  alias :error_on :errors_on
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: booklist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Dafydd Crosby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,11 +34,24 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
 description: A book collection program
 email: dafydd@dafyddcrosby.com
 executables:
@@ -56,30 +65,36 @@ files:
 - bin/booklist
 - booklist.gemspec
 - db/migrate/001_initial.rb
+- lib/booklist.rb
+- lib/booklist/book.rb
+- lib/booklist/tag.rb
 - lib/booklist/version.rb
+- spec/book_spec.rb
+- spec/support/active_record.rb
 homepage: https://github.com/dafyddcrosby/booklist
 licenses:
 - bsd
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Booklist helps you keep a list of books you've read or want to read.
-test_files: []
+test_files:
+- spec/book_spec.rb
+- spec/support/active_record.rb