enju_question 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ec192a8b2cd54e95928a94bda7943af9b2c9c1
-  data.tar.gz: b2a0fcf2e2fa825b998f7bbfb4d07ce6642116c8
+  metadata.gz: ac98a495fd5e15eebfb7fbb906fdf553318224f3
+  data.tar.gz: 0dd06e0911c3a478cdfbdfa1aa01a87de9672c8e
 SHA512:
-  metadata.gz: db89bf4f4437103cda2913f9d7c78b392bfaa9c4eba748910929347bd030e9f6844a563943716660f0945b1ddc45e6ac3034d996783b945823937bb014c6dbd1
-  data.tar.gz: 09c353e4b9f02f1f3162d28b40547e85875173230d1d00ce7a58e4eac8aac98c4a6c4125410720ca9774d3bf68513cd5a84bcece1bebc8305b39ac3bb84afdf3
+  metadata.gz: fa616ed9597483be2c7e47d7ba270a4a6b289c4f8650371b0e6ca4932dda26e4074c9503b1f629d3e7b577708fa06bb495d941a98060ef542ba460e68d659662
+  data.tar.gz: 01565cefe42e83e5a87cb5b3937ef1eec64491a3fd5f9581187c41484f7a106515f8d138aeee9bd08f6e6b01136adefc0e2c03005043f4c4de73313c17f2956b

data/app/models/enju_question/ability.rb

@@ -0,0 +1,44 @@
+module EnjuQuestion
+  class Ability
+    include CanCan::Ability
+  
+    def initialize(user, ip_address = nil)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can :manage, Answer
+        can :manage, Question
+      when 'Librarian'
+        can :manage, Answer
+        can :manage, Question
+      when 'User'
+        can [:index, :create], Answer
+        can :show, Answer do |answer|
+          if answer.user == user
+            true
+          elsif answer.question.shared
+            true
+          end
+        end
+        can [:update, :destroy], Answer do |answer|
+          answer.user == user
+        end
+        can [:index, :create], Question
+        can [:update, :destroy], Question do |question|
+          question.user == user
+        end
+        can :show, Question do |question|
+          question.user == user or question.shared
+        end
+      else
+        can :index, Answer
+        can :show, Answer do |answer|
+          answer.question.shared
+        end
+        can :index, Question
+        can :show, Question do |question|
+          question.shared
+        end
+      end
+    end
+  end
+end

data/lib/enju_question.rb

@@ -1,5 +1,7 @@
 require "enju_question/engine"
 require "enju_question/user"
+require "enju_question/manifestation"
+require "enju_question/item"
 
 module EnjuQuestion
   def self.included(base)
@@ -24,3 +26,5 @@ end
 
 ActionController::Base.send(:include, EnjuQuestion)
 ActiveRecord::Base.send :include, EnjuQuestion::QuestionUser
+ActiveRecord::Base.send :include, EnjuQuestion::QuestionManifestation
+ActiveRecord::Base.send :include, EnjuQuestion::QuestionItem

data/lib/enju_question/item.rb

@@ -0,0 +1,14 @@
+module EnjuQuestion
+  module QuestionItem
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_question_item_model
+        has_many :answer_has_items, :dependent => :destroy
+        has_many :answers, :through => :answer_has_items
+      end
+    end
+  end
+end

data/lib/enju_question/manifestation.rb

@@ -0,0 +1,33 @@
+module EnjuQuestion
+  module QuestionManifestation
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_question_manifestation_model
+        include InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def questions(options = {})
+        id = self.id
+        options = {:page => 1, :per_page => Question.default_per_page}.merge(options)
+        page = options[:page]
+        per_page = options[:per_page]
+        user = options[:user]
+        Question.search do
+          with(:manifestation_id).equal_to id
+          any_of do
+            unless user.try(:has_role?, 'Librarian')
+              with(:shared).equal_to true
+            #  with(:username).equal_to user.try(:username)
+            end
+          end
+          paginate :page => page, :per_page => per_page
+        end.results
+      end
+    end
+  end
+end

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end

data/spec/dummy/app/models/ability.rb

@@ -1,42 +1,44 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(user)
-    case user.try(:role).try(:name)
-    when 'Administrator'
-      can :manage, Answer
-      can :manage, Question
-    when 'Librarian'
-      can :manage, Answer
-      can :manage, Question
-    when 'User'
-      can [:index, :create], Answer
-      can :show, Answer do |answer|
-        if answer.user == user
-          true
-        elsif answer.question.shared
-          true
+#module EnjuQuestion
+  class Ability
+    include CanCan::Ability
+  
+    def initialize(user, ip_address = nil)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can :manage, Answer
+        can :manage, Question
+      when 'Librarian'
+        can :manage, Answer
+        can :manage, Question
+      when 'User'
+        can [:index, :create], Answer
+        can :show, Answer do |answer|
+          if answer.user == user
+            true
+          elsif answer.question.shared
+            true
+          end
+        end
+        can [:update, :destroy], Answer do |answer|
+          answer.user == user
+        end
+        can [:index, :create], Question
+        can [:update, :destroy], Question do |question|
+          question.user == user
+        end
+        can :show, Question do |question|
+          question.user == user or question.shared
+        end
+      else
+        can :index, Answer
+        can :show, Answer do |answer|
+          answer.question.shared
+        end
+        can :index, Question
+        can :show, Question do |question|
+          question.shared
         end
-      end
-      can [:update, :destroy], Answer do |answer|
-        answer.user == user
-      end
-      can [:index, :create], Question
-      can [:update, :destroy], Question do |question|
-        question.user == user
-      end
-      can :show, Question do |question|
-        question.user == user or question.shared
-      end
-    else
-      can :index, Answer
-      can :show, Answer do |answer|
-        answer.question.shared
-      end
-      can :index, Question
-      can :show, Question do |question|
-        question.shared
       end
     end
   end
-end
+#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre5
+  version: 0.1.0.pre6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre23
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - app/controllers/questions_controller.rb
 - app/models/answer.rb
 - app/models/answer_has_item.rb
+- app/models/enju_question/ability.rb
 - app/models/question.rb
 - app/models/question_sweeper.rb
 - app/views/answers/_form.html.erb
@@ -223,6 +224,8 @@ files:
 - db/migrate/20100217054028_create_answer_has_items.rb
 - db/migrate/20120418124018_add_answer_feed_token_to_user.rb
 - lib/enju_question/engine.rb
+- lib/enju_question/item.rb
+- lib/enju_question/manifestation.rb
 - lib/enju_question/user.rb
 - lib/enju_question/version.rb
 - lib/enju_question.rb
@@ -367,16 +370,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_3e.fdt
-- spec/dummy/solr/data/test/index/_3e.fdx
-- spec/dummy/solr/data/test/index/_3e.fnm
-- spec/dummy/solr/data/test/index/_3e.frq
-- spec/dummy/solr/data/test/index/_3e.nrm
-- spec/dummy/solr/data/test/index/_3e.prx
-- spec/dummy/solr/data/test/index/_3e.tii
-- spec/dummy/solr/data/test/index/_3e.tis
+- spec/dummy/solr/data/test/index/_4m.fdt
+- spec/dummy/solr/data/test/index/_4m.fdx
+- spec/dummy/solr/data/test/index/_4m.fnm
+- spec/dummy/solr/data/test/index/_4m.frq
+- spec/dummy/solr/data/test/index/_4m.nrm
+- spec/dummy/solr/data/test/index/_4m.prx
+- spec/dummy/solr/data/test/index/_4m.tii
+- spec/dummy/solr/data/test/index/_4m.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6t
+- spec/dummy/solr/data/test/index/segments_99
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/answer.rb
@@ -555,16 +558,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_3e.fdt
-- spec/dummy/solr/data/test/index/_3e.fdx
-- spec/dummy/solr/data/test/index/_3e.fnm
-- spec/dummy/solr/data/test/index/_3e.frq
-- spec/dummy/solr/data/test/index/_3e.nrm
-- spec/dummy/solr/data/test/index/_3e.prx
-- spec/dummy/solr/data/test/index/_3e.tii
-- spec/dummy/solr/data/test/index/_3e.tis
+- spec/dummy/solr/data/test/index/_4m.fdt
+- spec/dummy/solr/data/test/index/_4m.fdx
+- spec/dummy/solr/data/test/index/_4m.fnm
+- spec/dummy/solr/data/test/index/_4m.frq
+- spec/dummy/solr/data/test/index/_4m.nrm
+- spec/dummy/solr/data/test/index/_4m.prx
+- spec/dummy/solr/data/test/index/_4m.tii
+- spec/dummy/solr/data/test/index/_4m.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6t
+- spec/dummy/solr/data/test/index/segments_99
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/answer.rb