taskwarrior 0.0.4 → 0.0.5

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 
 rvm:
   - 1.9.3
+  - jruby-19mode
+  - 1.8.7
 
 before_script:
  - mkdir ~/.task

data/README.md

@@ -18,6 +18,10 @@ Or install it yourself as:
 
     $ gem install taskwarrior
 
+## Platforms
+
+This gem is tested on Ruby 1.9.3. Please see the [build status](http://travis-ci.org/nerab/taskwarrior) for the status of other rubies.
+
 ## Usage
 
 `TaskWarrior::Repository` is the main entry point. It expects an array of JSON objects, typically produced by `task export`. Technically, anything that can be consumed by `JSON.parse` is fine as long as it follows the format TaskWarrior uses.

data/lib/taskwarrior.rb

@@ -1,6 +1,11 @@
+require 'active_model'
+require 'multi_json'
+require 'date'
+
 require "taskwarrior/version"
 
 require "taskwarrior/validations"
+require "taskwarrior/attributes"
 
 require "taskwarrior/repository"
 require "taskwarrior/task"

data/lib/taskwarrior/annotation.rb

@@ -1,6 +1,3 @@
-require 'active_model'
-require 'date'
-
 module TaskWarrior
   class Annotation
     attr_accessor :entry, :description

data/lib/taskwarrior/attributes.rb

@@ -0,0 +1,19 @@
+module TaskWarrior
+  module Attributes
+  	module ClassMethods
+		  def attributes(*attr)
+		    if attr.nil? or attr.empty?
+		      @attributes
+		    else
+		      @attributes = attr
+		      @attributes.each{|attr| self.send('attr_accessor', attr)}
+		    end
+		  end
+		end
+
+		# http://blog.jayfields.com/2006/12/ruby-instance-and-class-methods-from.html
+	  def self.included(base)
+	    base.extend(ClassMethods)
+	  end
+  end
+end

data/lib/taskwarrior/project.rb

@@ -1,5 +1,3 @@
-require 'active_model'
-
 module TaskWarrior
   class Project
     attr_reader :name, :tasks

data/lib/taskwarrior/repository.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module TaskWarrior
   class Repository
     def initialize(input)
@@ -7,7 +5,7 @@ module TaskWarrior
       @projects = Hash.new{|hash, key| hash[key] = Project.new(key)}
       @tags = Hash.new{|hash, key| hash[key] = Tag.new(key)}
 
-      JSON.parse(input).each{|json|
+      MultiJson.load(input).each{|json|
         task = TaskWarrior::TaskMapper.map(json)
         @tasks[task.uuid] = task
         @projects[task.project].tasks << task if task.project

data/lib/taskwarrior/tag.rb

@@ -1,5 +1,3 @@
-require 'active_model'
-
 module TaskWarrior
   class Tag
     attr_reader :name

data/lib/taskwarrior/task.rb

@@ -1,28 +1,34 @@
-require 'active_model'
-
 module TaskWarrior
   class Task
-    attr_accessor :description, :id, :entry, :status, :uuid, 
-                  :project, :dependencies, :parent, :children, 
-                  :priority, :tags, :annotations, 
-                  :start_at, :wait_at, :end_at, :due_at
+    include TaskWarrior::Attributes
+
+    attributes :description, :id, :entry, :status, :uuid, :project, :dependencies, :parent, :children, 
+               :priority, :tags, :annotations, :start_at, :wait_at, :end_at, :due_at
 
     include ActiveModel::Validations
 
     validates :description, :id, :entry, :status, :uuid, :presence => true
 
-    validates :id, :numericality => { :only_integer => true, :greater_than => 0}
+    validates :id, :numericality => {
+      :only_integer => true, 
+      :greater_than => 0
+    }
 
-    validates :uuid, :format => {:with => /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/,
-                                 :message => "'%{value}' does not match the expected format of a UUID"}
+    validates :uuid, :format => {   
+      :with    => /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/,
+      :message => "'%{value}' does not match the expected format of a UUID"
+    }
 
-    validates :status, :inclusion => {:in => [:pending, :waiting, :complete], :message => "%{value} is not a valid status"}
+    validates :status, :inclusion => {     
+      :in      => [:pending, :waiting, :complete], 
+      :message => "%{value} is not a valid status"
+    }
 
     validates :priority, :inclusion => {
-      :in => [:high, :medium, :low],
-      :allow_nil => true,
+      :in          => [:high, :medium, :low],
+      :allow_nil   => true,
       :allow_blank => true,
-      :message => "%{value} is not a valid priority"
+      :message     => "%{value} is not a valid priority"
     }
 
     include TaskWarrior::Validations
@@ -46,13 +52,7 @@ module TaskWarrior
 
     # other may have the same uuid, but if its attributes differ, it will not be equal
     def eql?(other)
-      # TODO Find a way to call attributes instead of listing them here again
-      # Maybe Virtus?
-      # http://solnic.eu/2012/01/10/ruby-datamapper-status.html
-      [:description, :id, :entry, :status, :uuid, 
-       :project, :dependencies, :parent, :children, 
-       :priority, :tags, :annotations, :start_at, :wait_at, 
-       :end_at, :due_at].each do |attr|
+      self.class.attributes.each do |attr|
         return false unless send(attr).eql?(other.send(attr))
       end
     end

data/lib/taskwarrior/version.rb

@@ -1,3 +1,3 @@
 module TaskWarrior
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/taskwarrior.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |gem|
   gem.version       = TaskWarrior::VERSION
 
   gem.add_dependency 'activemodel', '~> 3.2'
+  gem.add_dependency 'multi_json', '~> 1.3'
   
   gem.add_development_dependency 'activesupport', '~> 3.2'
-  gem.add_development_dependency 'twtest', '~> 0.0.5'
+  gem.add_development_dependency 'twtest', '~> 0.0.6'
   gem.add_development_dependency 'guard-test', '~> 0.5'
   gem.add_development_dependency 'guard-bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: guard-test
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +158,7 @@ files:
 - lib/taskwarrior.rb
 - lib/taskwarrior/annotation.rb
 - lib/taskwarrior/annotation_mapper.rb
+- lib/taskwarrior/attributes.rb
 - lib/taskwarrior/priority_mapper.rb
 - lib/taskwarrior/project.rb
 - lib/taskwarrior/repository.rb