fakecrm 0.9.9.beta1 → 0.9.9.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d190fc0cf9569dd4eb62f2d843db0febd4fa52
-  data.tar.gz: 9ee3ecf7a990ce957dcc1f89df3e53bcc7fb69f4
+  metadata.gz: 65aeb24a701c44b20fca4abcef97498b39a08efe
+  data.tar.gz: 19b687eb4fc99ef916decacadbcd46d52f11ea3b
 SHA512:
-  metadata.gz: 493c700aa1763b86db61f308f44e6eb58e9a9aef17b2a89d116667213597a2028e69810f7e7eb8416d58d13c53beec83cd15d803dce05612a6cd2a2fc288f4df
-  data.tar.gz: 73a8fbf4a74b10cf364ed8221f1f21a9f2501ee2603c247010ddcce706c89e72bb35a0ba590ff07fa92bfa8a766b5997a2971c453de3ea79a53169ea563dd531
+  metadata.gz: 0f941e7c058c5d2bc5a6fcede4dd857bb7e033060062b2cfc330b4346117d2615ae4685361988832d89a00bdd1b79319f84de125adeb103bedfcb16f6e7cdf34
+  data.tar.gz: 0c84d6ddd979e41d29b887bb72c29c663d47b184adae8e60abb53625c7513c17d7ae81ccdd5f9d5ea48491f9c9e5c52cfd7fc5f1e5f08d41c98b45e9454f3bde

data/README.md

@@ -42,6 +42,10 @@ For available configuration options see the output of the command:
 
     $ fakecrm --help
 
+## Notes
+
+Handling attachements is unsupported at the moment.
+
 ## Testing
 
 To prepare test environment execute (you must only do it once):

data/lib/fakecrm/drop.rb

@@ -8,7 +8,7 @@ module Fakecrm
         instance.attributes = data
 
         if instance.save
-          response = instance
+          response = ResourceView.decorate(instance)
         else
           status 422
           response = instance.errors.to_hash
@@ -19,7 +19,7 @@ module Fakecrm
     rescue ArgumentError => e
       status 422
       ::Fakecrm.logger.error("Unable to set unknown attribute: #{e.inspect}")
-      {:error => "Unknown attribute"}.to_json 
+      {:error => "Unknown attribute #{e.inspect}"}.to_json 
     end
 
     def update_one(resource, primary_key, data)
@@ -28,6 +28,7 @@ module Fakecrm
         instance = resource.get!(primary_key)
         ::Fakecrm.logger.debug("Updating resource with: #{data.inspect}")
         instance.attributes = data
+
         if instance.save
           response = {}
         else
@@ -43,7 +44,7 @@ module Fakecrm
     rescue ArgumentError => e
       status 422
       ::Fakecrm.logger.error("Unable to set unknown attribute: #{e.inspect}")
-      {:error => "Unknown attribute"}.to_json 
+      {:error => "Unknown attribute #{e.inspect}"}.to_json 
     end
 
     def destroy_one(resource, primary_key)

data/lib/fakecrm/fetch.rb

@@ -59,20 +59,21 @@ module Fakecrm
 
       # full text
       if params.key?('q')
-        fields = []
+        search_words = params['q'].split(/\s/)
+        sub_queries = []
         values = []
-        (full_text_fields + custom_fields).each do |full_text_field|
-          queries = params['q'].split(/\s/)
-
-          sub_fields = []
-          queries.each do |query|
-            sub_fields << "(#{full_text_field} LIKE ?)"
-            values << "%#{query}%"
-          end
-          fields << (" ( " + sub_fields.join(" OR ") + " ) ") unless sub_fields.empty?
+
+        search_words.each do |search_word|
+          sub_query = (full_text_fields + custom_fields).map do |full_text_field|
+            values << "%#{search_word}%"
+            "(#{full_text_field} LIKE ?)"
+          end.join(" OR ")
+
+          sub_queries << " ( " + sub_query + " ) "
         end
-        if !fields.empty?
-          options[:conditions] = [fields.join(' OR ')] + values
+
+        if !sub_queries.empty?
+          options[:conditions] = [sub_queries.join(" AND ")] + values
         end
       end
 

data/lib/fakecrm/resource/activity.rb

@@ -28,7 +28,7 @@ module Fakecrm
     property :updated_at,             DateTime
     property :deleted_at,             ParanoidDateTime
 
-    property :comments,               Json # FIXME: i'm not sure it will work
+    property :comments,               Json 
 
     property :updated_by,             String, :default => 'root'
 
@@ -52,6 +52,36 @@ module Fakecrm
       return true
     end
 
+    before :save do
+      self.comments = [] if self.comments.nil?
+    end
+
+    def self.transform_comment_params( params )
+      if params["comment_notes"]
+        if params["comment_contact_id"]
+          contact = Contact.get!( params["comment_contact_id"].to_i )
+        else
+          contact = Contact.search(:params => {:login => 'root'}).first
+        end
+        new_comment = {
+          :contact_id => contact.id,
+          :updated_by => 'root',
+          :notes => params["comment_notes"].to_s,
+          :published => !!params["comment_published"],
+          :updated_at => Time.now
+        }
+        params["comments"] = (Activity.get!(params["id"].to_i).comments || []) rescue []
+        params["comments"] << new_comment
+      end
+      params.delete("comment_notes")
+      params.delete("comment_contact_id")
+      params.delete("comment_published")
+
+      return params
+    rescue ::DataMapper::ObjectNotFoundError
+      status 404
+    end
+
   end
 end
 

data/lib/fakecrm/resource/event_contact.rb

@@ -1,7 +1,10 @@
 # -*- encoding : utf-8 -*-
+
+require 'fakecrm/tolerant_mass_assignment'
 module Fakecrm
   class EventContact
     include DataMapper::Resource
+    include Fakecrm::TolerantMassAssignment
 
     property :id,                 Serial
     property :state,              Enum['unregistered', 'registered', 'attended', 'refused', 'noshow'], :required => true
@@ -15,7 +18,6 @@ module Fakecrm
 
     belongs_to :event, :required => true
     belongs_to :contact, :required => true
-
   end
 end
 

data/lib/fakecrm/server/activities.rb

@@ -18,11 +18,11 @@ module Fakecrm
         end
 
         put '/crm/api/activities/:id.?:format?' do |id, format|
-          update_one(Activity, id.to_i, params["activity"])
+          update_one(Activity, id.to_i, Activity.transform_comment_params(params["activity"]))
         end
 
         post '/crm/api/activities.?:format?' do
-          create_one(Activity, params["activity"])
+          create_one(Activity, Activity.transform_comment_params(params["activity"]))
         end
 
         delete '/crm/api/activities/:id.?:format?' do |id, format|

data/lib/fakecrm/server/contacts.rb

@@ -84,7 +84,9 @@ module Fakecrm
         end
 
         post '/crm/api/contacts.?:format?' do |format|
-          create_one(Contact, params["contact"])
+          contact = params["contact"]
+          contact.delete("title") # workaround for silly connector tests
+          create_one(Contact, contact)
         end
 
         delete '/crm/api/contacts/:id.?:format?' do |id, format|

data/lib/fakecrm/tolerant_mass_assignment.rb

@@ -0,0 +1,38 @@
+module Fakecrm
+  module TolerantMassAssignment
+    # Assign values to multiple attributes in one call (mass assignment)
+    #
+    # @param [Hash] attributes
+    #   names and values of attributes to assign
+    #
+    # @return [Hash]
+    #   names and values of attributes assigned
+    #
+    # @note unknown custom_* attributes are ignored with warning
+    #
+    # @api public
+    def attributes=(attributes)
+      model = self.model
+      attributes.each do |name, value|
+        case name
+          when String, Symbol
+            if model.allowed_writer_methods.include?(setter = "#{name}=")
+              __send__(setter, value)
+            else
+              if name.to_s =~ /^custom_/
+                ::Fakecrm.logger.error("Ignoring the unknown attribute '#{name}' in #{model}")
+              else
+                raise ArgumentError, "The attribute '#{name}' is not accessible in #{model}"
+              end
+            end
+          when Associations::Relationship, Property
+            # only call a public #typecast (e.g. on Property instances)
+            if name.respond_to?(:typecast)
+              value = name.typecast(value)
+            end
+            self.persistence_state = persistence_state.set(name, value)
+        end
+      end
+    end
+  end
+end

data/lib/fakecrm/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Fakecrm
-  VERSION = "0.9.9.beta1"
+  VERSION = "0.9.9.beta2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakecrm
 version: !ruby/object:Gem::Version
-  version: 0.9.9.beta1
+  version: 0.9.9.beta2
 platform: ruby
 authors:
 - Mateusz Sojka
@@ -231,6 +231,7 @@ files:
 - lib/fakecrm/server/mailings.rb
 - lib/fakecrm/server/roles.rb
 - lib/fakecrm/server/templates.rb
+- lib/fakecrm/tolerant_mass_assignment.rb
 - lib/fakecrm/version.rb
 - locales/de.yml
 - locales/en.yml
@@ -299,3 +300,4 @@ test_files:
 - test/embedded/lib/tasks/.gitkeep
 - test/embedded/log/.gitkeep
 - test/embedded/script/rails
+has_rdoc: