fanforce 0.1.9 → 0.2.0

data/Rakefile

@@ -1 +1,60 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'fileutils'
+include FileUtils
+
+# Default Rake task is compile
+task :default => :compile
+
+########################################################################
+
+def make(makedir)
+  Dir.chdir(makedir) { sh 'make' }
+end
+
+def extconf(dir)
+  Dir.chdir(dir) { ruby "extconf.rb" }
+end
+
+def setup_extension(dir, extension)
+  ext = "ext/#{dir}"
+  ext_so = "#{ext}/#{extension}.#{RbConfig::CONFIG['DLEXT']}"
+  ext_files = FileList[
+      "#{ext}/*.c",
+      "#{ext}/*.h",
+      "#{ext}/extconf.rb",
+      "#{ext}/Makefile",
+      "lib"
+  ]
+
+  task "lib" do
+    directory "lib"
+  end
+
+  desc "Builds just the #{extension} extension"
+  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
+
+  file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
+    extconf "#{ext}"
+  end
+
+  file ext_so => ext_files do
+    make "#{ext}"
+    cp ext_so, "lib"
+  end
+end
+
+########################################################################
+
+setup_extension("", "pr_query_parser")
+
+desc "Compile the extension"
+task :compile => [:pr_query_parser]
+
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.libs.push "test"
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end

data/ext/Makefile

@@ -0,0 +1,213 @@
+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1
+hdrdir = /Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1
+arch_hdrdir = /Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/calebclark/.rbenv/versions/1.9.3-p194
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+NULLCMD = :
+
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_A)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
+CFLAGS   = -fno-common $(cflags)  -pipe $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =  -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L'/Users/calebclark/.rbenv/versions/1.9.3-p194/lib'  -L/usr/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
+AR = ar
+EXEEXT = 
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = x86_64-darwin12.1.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /Users/calebclark/.rbenv/versions/1.9.3-p194/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = rmdir -p
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS =  -lcurl  -lpthread -ldl -lobjc 
+SRCS = pr_query_parser.c
+OBJS = pr_query_parser.o
+TARGET = pr_query_parser
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+pre-install-rb-default:
+	$(ECHO) installing default pr_query_parser libraries
+$(RUBYARCHDIR):
+	$(Q) $(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	@-$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/mkmf.log

@@ -0,0 +1,38 @@
+have_library: checking for curl_easy_unescape() in -lcurl... -------------------- yes
+
+"gcc -o conftest -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/x86_64-darwin12.1.0 -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/ruby/backward -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1 -I. -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'   -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration  -pipe conftest.c  -L. -L/Users/calebclark/.rbenv/versions/1.9.3-p194/lib -L. -L'/Users/calebclark/.rbenv/versions/1.9.3-p194/lib'  -L/usr/local/lib     -lruby-static  -lpthread -ldl -lobjc "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main() {return 0;}
+/* end */
+
+"gcc -o conftest -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/x86_64-darwin12.1.0 -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/ruby/backward -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1 -I. -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'   -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration  -pipe conftest.c  -L. -L/Users/calebclark/.rbenv/versions/1.9.3-p194/lib -L. -L'/Users/calebclark/.rbenv/versions/1.9.3-p194/lib'  -L/usr/local/lib     -lruby-static -lcurl  -lpthread -ldl -lobjc "
+conftest.c: In function ‘t’:
+conftest.c:5: error: ‘curl_easy_unescape’ undeclared (first use in this function)
+conftest.c:5: error: (Each undeclared identifier is reported only once
+conftest.c:5: error: for each function it appears in.)
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: /*top*/
+4: int main() {return 0;}
+5: int t() { void ((*volatile p)()); p = (void ((*)()))curl_easy_unescape; return 0; }
+/* end */
+
+"gcc -o conftest -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/x86_64-darwin12.1.0 -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1/ruby/backward -I/Users/calebclark/.rbenv/versions/1.9.3-p194/include/ruby-1.9.1 -I. -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I'/Users/calebclark/.rbenv/versions/1.9.3-p194/include'   -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration  -pipe conftest.c  -L. -L/Users/calebclark/.rbenv/versions/1.9.3-p194/lib -L. -L'/Users/calebclark/.rbenv/versions/1.9.3-p194/lib'  -L/usr/local/lib     -lruby-static -lcurl  -lpthread -ldl -lobjc "
+conftest.c: In function ‘t’:
+conftest.c:5: warning: implicit declaration of function ‘curl_easy_unescape’
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: /*top*/
+4: int main() {return 0;}
+5: int t() { curl_easy_unescape(); return 0; }
+/* end */
+
+--------------------
+

data/lib/fanforce/main.rb

@@ -46,7 +46,7 @@ class Fanforce
     case response.code
       when 200, 201
         begin
-          response = MultiJson.load(response, :symbolize_keys => symbolize_keys)
+          response = decode_json(response)
         rescue
           raise UnknownError.new(response, request, path, query)
         end
@@ -85,5 +85,4 @@ class Fanforce
     'http://' + $API_DOMAIN + path
   end
 
-
 end

data/lib/fanforce/utils.rb

@@ -2,27 +2,24 @@ require 'uri'
 require 'query_string_parser'
 
 module Fanforce::Utils
+  def self.included(base) base.extend(self)  end
 
-  def self.included(base)
-    base.extend(Fanforce::Utils)
-  end
-
-  def self.blank?(obj)
+  def blank?(obj)
     obj.respond_to?(:empty?) ? obj.empty? : !obj
   end
 
-  def self.present?(obj)
+  def present?(obj)
     !blank?(obj)
   end
 
-  def self.valid_request?(params)
+  def valid_request?(params)
     return false if !params.is_a?(Hash)
     return false if blank?(params[:fanforce_id])
     return false if blank?(params[:app_id]) and blank?(params[:behavior_id]) and blank?(params[:module_id]) and blank?(params[:widget_id])
     return true
   end
 
-  def self.valid_install_request?(params)
+  def valid_install_request?(params)
     return false if !params.is_a?(Hash)
     return false if blank?(params[:fanforce_id])
     return false if blank?(params[:app_id]) and blank?(params[:behavior_id]) and blank?(params[:module_id]) and blank?(params[:widget_id])
@@ -30,7 +27,7 @@ module Fanforce::Utils
     return true
   end
 
-  def self.valid_uninstall_request?(params)
+  def valid_uninstall_request?(params)
     return false if !params.is_a?(Hash)
     return false if blank?(params[:fanforce_id])
     return false if blank?(params[:app_id]) and blank?(params[:behavior_id]) and blank?(params[:module_id]) and blank?(params[:widget_id])
@@ -38,7 +35,7 @@ module Fanforce::Utils
     return true
   end
 
-  def self.parse_params(params)
+  def parse_params(params)
     if present?(params[:app_id])
       plugin_type = :app
       plugin_id = params[:app_id]
@@ -55,7 +52,7 @@ module Fanforce::Utils
     {:"#{plugin_type}_id" => params["#{plugin_type}_id"], plugin_type: plugin_type, plugin_id: plugin_id, fanforce_id: params[:fanforce_id], api_key: params[:api_key]}
   end
 
-  def self.parse_url(raw_url)
+  def parse_url(raw_url)
     return if blank?(raw_url)
     url = URI::parse(raw_url)
     query_params = QueryStringParser.qs_parse(url.query).inject({}) do |result, (k,v)|
@@ -69,7 +66,7 @@ module Fanforce::Utils
     { _external_id: _external_id, clean_url: clean_url, raw_url: raw_url, query_params: query_params, query_string: query_string, scheme: url.scheme, host: url.host, port: url.port, path: url.path, fragment: url.fragment }
   end
 
-  def self.to_query_string(params, namespace = nil)
+  def to_query_string(params, namespace = nil)
     if params.is_a?(String)
       params
     elsif params.is_a?(Array)
@@ -81,9 +78,13 @@ module Fanforce::Utils
     end
   end
 
-  def self.to_query_chunk(value,key)
+  def to_query_chunk(value,key)
     require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
     "#{CGI.escape(to_query_string(key))}=#{CGI.escape(to_query_string(value).to_s)}"
   end
 
+  def decode_json(str, symbolize_keys=true)
+    MultiJson.load(str, :symbolize_keys => symbolize_keys)
+  end
+
 end

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/test/fanforce_test.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'minitest/autorun'
+
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'fanforce'
+
+describe Fanforce do
+
+  it "should test if var is blank" do
+    assert Fanforce.blank?(nil)
+    assert !Fanforce.blank?("value")
+
+    ff = Fanforce.new
+    assert ff.blank?(nil)
+    assert !ff.blank?("value")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,8 +75,12 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- ext/Makefile
 - ext/extconf.rb
+- ext/mkmf.log
+- ext/pr_query_parser.bundle
 - ext/pr_query_parser.c
+- ext/pr_query_parser.o
 - fanforce.gemspec
 - lib/fanforce.rb
 - lib/fanforce/config.rb
@@ -84,7 +88,9 @@ files:
 - lib/fanforce/main.rb
 - lib/fanforce/utils.rb
 - lib/fanforce/version.rb
+- lib/pr_query_parser.bundle
 - lib/query_string_parser.rb
+- test/fanforce_test.rb
 homepage: http://github.com/mlabs/fanforce-ruby
 licenses: []
 post_install_message: 
@@ -109,4 +115,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby API wrapper for Fanforce
-test_files: []
+test_files:
+- test/fanforce_test.rb