iqvoc_compound_forms 1.1.0 → 1.1.1

data/app/models/compound_form/base.rb

@@ -14,7 +14,9 @@ class CompoundForm::Base < ActiveRecord::Base
     :foreign_key => 'compound_form_id',
     :dependent   => :destroy
 
-  scope :published, includes(:domain).merge(Label::Base.published)
+  def self.published
+    includes(:domain).merge(Label::Base.published)
+  end
 
   def self.referenced_by(label_class)
     # To something with the label class

data/app/models/compound_form/content/base.rb

@@ -7,15 +7,15 @@ class CompoundForm::Content::Base < ActiveRecord::Base
   belongs_to :compound_form, :class_name => 'CompoundForm::Base', :foreign_key => 'compound_form_id'
   belongs_to :label,         :class_name => 'Label::Base', :foreign_key => 'label_id'
 
-  scope :label_published, lambda {
+  def self.label_published
     includes(:label).merge(Label::Base.published)
-  }
+  end
 
-  scope :target_in_edit_mode, lambda { |domain_id| {
-      :joins      => [:compound_form, :label],
-      :include    => :label,
-      :conditions => "(compound_forms.domain_id = #{domain_id}) AND (labels.locked_by IS NOT NULL)" }
-  }
+  def self.target_in_edit_mode(domain_id)
+    joins(:compound_form, :label).
+    includes(:label).
+    where("(compound_forms.domain_id = ?) AND (labels.locked_by IS NOT NULL)", domain_id)
+  end
 
   def self.referenced_by(label_class)
     # To something with the label class

data/lib/iqvoc/compound_forms/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module CompoundForms
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_compound_forms
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70106648761580 !ruby/object:Gem::Requirement
+  requirement: &70253498985560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70106648761580
+  version_requirements: *70253498985560
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70106648759840 !ruby/object:Gem::Requirement
+  requirement: &70253498985060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70106648759840
+  version_requirements: *70253498985060
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70106648758380 !ruby/object:Gem::Requirement
+  requirement: &70253498984600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,7 +45,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70106648758380
+  version_requirements: *70253498984600
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_compound_forms
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ''